Merge remote-tracking branch 'origin/master'

modules/i3plus-pojo-base/pom.xml

@@ -31,6 +31,10 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -100,6 +100,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
+        HqlPack.getNumEqualPack(wmsTransType.getIsValid(),"isValid",result);
         HqlPack.getStringLikerPack(wmsTransType.getTransCode(),"transCode",result);
         HqlPack.getStringLikerPack(wmsTransType.getTransName(),"transName",result);