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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -255,7 +255,7 @@ public class DdlPreparedPack {
      * @param packBean
      */
     public static void getNumEqualPack(Object data, String columnName, DdlPackBean packBean) {
-        if (data != null) {
+        if (data != null && Long.parseLong(data.toString()) > 0) {
             packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
         }
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @AllArgsConstructor
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "DROOLS_RULE_PERSISTENCE")
 @Api("系统动态业务规则")