解决冲突

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

@@ -1507,4 +1507,41 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 组件统一返回提示
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RC_RESPONSE_TIPS {
+
+        OK(10, "正确"),
+        FAIL(20, "失败"),
+        NO_SKIP(30, "不跳转");
+
+        private int value;
+        private String description;
+
+        RC_RESPONSE_TIPS(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;
+        }
+    }
 }