解决冲突

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

@@ -1769,4 +1769,37 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 成功标志枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RC_OK_VALUE {
+
+        IS_TRUE(10, true, "成功"),
+        IS_FALSE(20, false, "失败");
+
+        private int value;
+        private boolean codeValue;
+        private String description;
+
+        RC_OK_VALUE(int value, boolean codeValue, String description) {
+            this.value = value;
+            this.codeValue = codeValue;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public boolean getCodeValue() {
+            return codeValue;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java

@@ -54,4 +54,8 @@ public class WmsActionStepCall extends BaseBean {
     @Column(name="AM_TYPE")
     @ApiParam(value = "组件类型", example = "0")
     public Integer amType;
+
+    @Column(name="OK_VALUE")
+    @ApiParam(value = "成功标志", example = "10")
+    public Integer okValue;
 }