Merge remote-tracking branch 'origin/test' into test

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

@@ -6242,4 +6242,39 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum YELLOW_GUN_RULE {
+        COLLECT_TORQUE(10, "继续采集扭矩"),
+        SEND_NEXT_GROUP_CODE(20, "发送下一个组合码");
+
+        private int value;
+        private String description;
+
+        YELLOW_GUN_RULE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -3771,40 +3771,6 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码)
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum YELLOW_GUN_RULE {
-        COLLECT_TORQUE(10, "继续采集扭矩"),
-        SEND_NEXT_GROUP_CODE(20, "发送下一个组合码");
-
-        private int value;
-        private String description;
-
-        YELLOW_GUN_RULE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-    /**
      * 界面类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)