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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -30,12 +30,12 @@ public class WmsInterfaceDataMapper extends BaseBean {
      * 排序编号
      */
     @Column(name = "SEQ")
-    public int seq;
+    public Integer seq;
     /**
      * 来源表的每次查询记录数，防止大量数据造成内存溢出
      */
     @Column(name = "SRC_GET_LIMIT")
-    public int srcGetLimit;
+    public Integer srcGetLimit;
     /**
      * 接口数据源编号（在动态表单中配置）
      */
@@ -132,23 +132,23 @@ public class WmsInterfaceDataMapper extends BaseBean {
      * 调用脚本方法获取数据
      */
     @Column(name = "USE_SCRIPT_PULL")
-    public int useScriptPull;
+    public Integer useScriptPull;
 
     /**
      * 调用脚本方法保存数据
      */
     @Column(name = "USE_SCRIPT_PUSH")
-    public int useScriptPush;
+    public Integer useScriptPush;
 
     /**
      * 调用脚本方法更新同步标志
      */
     @Column(name = "USE_SCRIPT_MARK")
-    public int useScriptMark;
+    public Integer useScriptMark;
 
     /**
      * 调用脚本方法过滤数据（查询来源数据后过滤）
      */
     @Column(name = "USE_SCRIPT_FILTER")
-    public int useScriptFilter;
+    public Integer useScriptFilter;
 }