解决代码冲突

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

@@ -7667,83 +7667,6 @@ public class MesEnumUtil {
     }
 
     /**
-     * 过程检测检测对象数据类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum QC_CHECK_VALUE_TYPE {
-        STRING(10, "字符串"),
-        INTEGER(20, "数值");
-
-        private int value;
-        private String description;
-
-        QC_CHECK_VALUE_TYPE(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)
-    public enum QC_CHECK_DATA_SOURCE {
-        MANUAL_INPUT(10, "10", "人工输入"),
-        DB(30, "30", "数据库"),
-        PLC(20, "20", "PLC");
-
-        private int value;
-        private String description;
-        private String code;
-
-        QC_CHECK_DATA_SOURCE(int value, String code, String description) {
-            this.value = value;
-            this.description = description;
-            this.code = code;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        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)