Merge branch 'dev' into test

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

@@ -947,12 +947,12 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_TYPE {
-        PART("PART_ALARM", 111020005, "物料"),
-        QUALITY("QUALITY_ALARM", 111020006, "质量"),
-        EQUIP("EQUMENT_ALARM", 111020007, "设备"),
-        PROCESS("ROUTING_ALARM", 111020008, "工艺"),
-        CHECK("OTHER_ALARM", 111020009, "自处理"),
-        FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
+        PART("PART_ALARM", 110060205, "物料"),
+        QUALITY("QUALITY_ALARM", 110060206, "质量"),
+        EQUIP("EQUMENT_ALARM", 110060207, "设备"),
+        PROCESS("ROUTING_ALARM", 110060208, "工艺"),
+        CHECK("OTHER_ALARM", 110060209, "自处理"),
+        FIX_ERROR("FIX_ERROR", 110060210, "自动报警");
 
         private String value;
         private Integer code;