解决冲突

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

@@ -48,6 +48,6 @@ public class WmsActionModuleParam extends BaseBean {
     public String paramValueList;
 
     @Column(name = "PARAM_TYPE")
-    @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串】", example = "0")
+    @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串,30=出参】", example = "0")
     public Integer paramType;
 }

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

@@ -76,12 +76,13 @@ public class WmsActionResponseBean<Obj> {
         this.message = message;
     }
 
-    public WmsActionResponseBean(String percent, String message, List<String> informations, Obj details, Boolean codeStatus) {
+    public WmsActionResponseBean(String percent, String message, List<String> informations, Obj details, Boolean codeStatus, Map<String, Obj> barCode) {
         this.percent = percent;
         this.message = message;
         this.informations = informations;
         this.details = details;
         this.codeStatus = codeStatus;
+        this.barCode = barCode;
     }
 
 }

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

@@ -1063,6 +1063,7 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result);
+        HqlPack.getNumEqualPack(wmsActionModuleParam.getParamType(), "paramType", result);
         getStringBuilderPack(wmsActionModuleParam, result);
 
         return result.toString();