Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-08-22 652fca264c2468782a2d5a4fbe21a13df448b91a

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteUserInfoDO.java

@@ -7,6 +7,16 @@
@TableName("emergency_drill_execute_user")
public class EmergencyDrillExecuteUserInfoDO {

    private String userName;

    public String getUserName() {
        return userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

    @TableId(type = IdType.AUTO)
    private Long id;