Merge remote-tracking branch 'origin/dev' into test

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

@@ -1221,14 +1221,14 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsActionModule(WmsActionModule wmsActionModule) {
         DdlPackBean result = new DdlPackBean();
 
-        //查询参数封装
-        DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result);
+        // 查询参数封装
+        DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amDesc", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result);
         DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result);
-
-        getStringBuilderPack(wmsActionModule, result);
+        DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
         return result;
     }