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/JgEnableDisable.java

@@ -136,4 +136,15 @@ public class JgEnableDisable extends BaseEntity {
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
+
+
+    @TableField(value = "create_user_company_name")
+    private String createUserCompanyName;
+
+    @TableField(exist = false)
+    private String equList;
+
+    @TableField(exist = false)
+    private String supervisoryCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java

@@ -32,8 +32,8 @@ public enum BusinessTypeEnum {
 
     JG_RENOVATION_REGISTRATION("111", "改造变更登记"),
 
-    JG_EQUIPMENT_STOP("112-1", "设备启用"),
-    JG_EQUIPMENT_START("112-2", "设备停用"),
+    JG_EQUIPMENT_START("112-1", "设备启用"),
+    JG_EQUIPMENT_STOP("112-2", "设备停用"),
 
     JG_EQUIPMENT_MOVE("113-1", "移装报废"),
     JG_EQUIPMENT_CANCEL("113-2", "注销报废"),