Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -421,6 +421,7 @@ public class JgInstallationNotice extends BaseEntity {
             @TableField(exist = false)
     private String factoryNum;
 
-
+//    @TableField("\"create_user_name\"")
+//    private String nextExecuteUserIds;
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableServiceImpl.java

@@ -189,7 +189,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             jgEnableDisable.setRemark(map.get("remark") == null ? "" : map.get("remark").toString());
             jgEnableDisable.setApplyDate(new Date());
             jgEnableDisable.setApplyType(String.valueOf(map.get("applyType")));
-            jgEnableDisable.setAuditStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
+            jgEnableDisable.setAuditStatus(ObjectUtils.isEmpty(jgEnableDisable.getAuditStatus()) ? FlowStatusEnum.TO_BE_SUBMITTED.getName() : jgEnableDisable.getAuditStatus());
         }
         // 仅保存
         this.saveOrUpdate(jgEnableDisable);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -21,7 +21,7 @@
     "type": "102",
     "pageType": "draft",
     "name": "安装告知",
-    "url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&roleIds={roleIds}&userId={userId}&formType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1734127099570057217&roleIds={roleIds}&userId={userId}&formType=edit"
   },
   {
     "type": "102",