解决冲突

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

@@ -1514,17 +1514,23 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum RC_RESPONSE_TIPS {
 
-        OK(true, "正确"),
+        OK(1, true, "正确"),
-        NG(false, "失败");
+        NG(2, false, "失败");
 
+        private int value;
         private boolean codeStatus;
         private String description;
 
-        RC_RESPONSE_TIPS(boolean codeStatus, String description) {
+        RC_RESPONSE_TIPS(int value, boolean codeStatus, String description) {
+            this.value = value;
             this.codeStatus = codeStatus;
             this.description = description;
         }
 
+        public int getValue() {
+            return value;
+        }
+
         public boolean getCodeStatus() {
             return codeStatus;
         }