解决冲突

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import lombok.RequiredArgsConstructor;
 
 import java.util.List;
 import java.util.Map;
@@ -40,5 +41,10 @@ public class WmsActionResponseBean {
     public List<Map<String, Object>> details;
 
     @ApiParam(value = "结果代码")
-    public Boolean codeStatus;
+    public boolean codeStatus;
+
+    private WmsActionResponseBean(boolean codeStatus, String message) {
+        this.codeStatus = codeStatus;
+        this.message = message;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1156,6 +1156,4 @@ public class WmsHqlPack {
 
         return  result.toString();
     }
-
-
 }