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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java

@@ -77,7 +77,7 @@ public class WmsPOMaster extends BaseBean {
     private String vendorName;
 
     @Column(name = "IS_TASK")
-    @ApiParam(value = "是否生产任务", example = "1")
+    @ApiParam(value = "是否生成任务", example = "1")
     public Integer isTask;
 
     @Column(name = "IS_PART")
@@ -103,4 +103,8 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     @ApiParam(value = "发货日期")
     private String sendDate;
+
+    @Column(name = "IS_SN")
+    @ApiParam(value = "是否生成条码", example = "1")
+    public Integer isSn;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java

@@ -105,7 +105,7 @@ public class WmsPOMasterDetails extends BaseBean {
 
     @Column(name = "SNP")
     @ApiParam("标准包装")
-    public String snp;
+    public Integer snp;
 
     /**
      * 是否免费:0=计费,1=免费