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

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

@@ -54,9 +54,9 @@ public class AndonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_BUSI_FLAG{
 
-        ALARM_FLAG("10","按灯状态"),
-        USER_CODE("20","工号"),
-        READ_FLAG("30", "读取状态");
+        ALARM_FLAG("10","安灯呼叫标识"),
+        USER_CODE("20","用户工号"),
+        READ_FLAG("30", "安灯读取状态");
 
         private String value;
         private String description;
@@ -192,11 +192,11 @@ public class AndonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_CODE{
 
-        PART("MM","物料"),
-        QUALITY("QM","质量"),
-        EQUIP("EQ","设备"),
-        PROCESS("GY","工艺"),
-        CHECK("JC","检测");
+        PART("PART_ALARM","物料"),
+        QUALITY("QUALITY_ALARM","质量"),
+        EQUIP("EQUMENT_ALARM","设备"),
+        PROCESS("ROUTING_ALARM","工艺"),
+        CHECK("OTHER_ALARM","其他");
 
         private String value;
         private String description;