Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -4673,6 +4673,25 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_BUSI_TYPE {
+        AGV_EMERGENCY_STOP(10, "紧急停止"),
+        AGV_EMERGENCY_RESET(20, "急停复位"),
+        AGV_DELAY_HELP(30, "延时帮助");
+
+        private int value;
+        private String description;
+
+        PLC_BUSI_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
     /**
      * mes设备状态
      */

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java

@@ -88,7 +88,7 @@ public class MesPlc extends BaseBean implements Serializable {
 
     @Column(name = "BUSI_TYPE")
     @ApiParam("业务类型")
-    private String busiType;
+    private Integer busiType;
 
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")