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

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

@@ -1606,11 +1606,16 @@ public class WmsHqlPack {
      * @param wmsConfig
      * @return
      */
-    public static String packHqlWmsConfig(WmsConfig wmsConfig) {
-        StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result);
+    public static DdlPackBean packHqlWmsConfig(WmsConfig wmsConfig) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result);
+        DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result);
+        DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result);
+        DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigValueType(), "configValueType", result);
+
         getStringBuilderPack(wmsConfig, result);
-        return result.toString();
+        return result;
     }
 
     /**