解决冲突

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

@@ -44,9 +44,9 @@ public class WmsActionResponseBean {
     public List<Map<String, Object>> details;
 
     @ApiParam(value = "结果代码")
-    public boolean codeStatus;
+    public Boolean codeStatus;
 
-    public WmsActionResponseBean(boolean codeStatus, String message) {
+    public 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

@@ -1068,6 +1068,9 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result);
+        HqlPack.getNumEqualPack(wmsActionModule.getId(), "id", result);
+        HqlPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result);
+
         getStringBuilderPack(wmsActionModule, result);
 
         return result.toString();