Jenkins自动合并

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

@@ -38,7 +38,7 @@ public class CommonEnumUtil {
         HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
         LAC(26, 8600, 13, "lac", "连接适配器"),
         ANDON(27, 8500, 14, "andon", "安灯"),
-        APS(28, 8400, 15, "APS", "高级计划与排程"),
+        APS(28, 8400, 15, "i3aps", "高级计划与排程"),
         CENTER(99, 8000, 1, "icloud-server", "注册中心"),
         SURFACE(98, 0, 0, "i3surface", "对外服务"),
         CLOUD(97, 0, 0, "i3cloud", "微服务"),

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

@@ -4920,4 +4920,36 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 自定义列表：优先级  (CUSTOMIZE_PROP)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CUSTOMIZE_PROP {
+        DEFAULT(1, "默认"), CUSTOMIZE(2, "自定义");
+        private int value;
+        private String description;
+
+        CUSTOMIZE_PROP(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

pom.xml

@@ -31,6 +31,7 @@
         <module>modules/i3plus-pojo-mes-pcn</module>
         <module>modules/i3plus-pojo-sweb</module>
         <module>modules/i3plus-pojo-andon</module>
+        <module>modules/i3plus-pojo-aps</module>
         <module>modules/i3plus-pojo-lac</module>
         <module>modules/i3plus-pojo-ptl</module>
         <module>modules/i3plus-pojo-ptl-pcn</module>