Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -62,6 +62,10 @@ public class WmsAreaOwner extends BaseBean {
     @ApiParam(value = "是否预分配人员")
     private Integer isPreAssign;
 
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次编码")
+    private String shiftNo;
+
     @Transient
     @ApiParam(value = "供应商名称")
     private String vendorName;
@@ -81,4 +85,8 @@ public class WmsAreaOwner extends BaseBean {
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编号")
     private String custNo;
+
+    @Transient
+    @ApiParam(value = "分配次数")
+    private Integer count;
 }

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

@@ -80,6 +80,7 @@ public class WmsSnOperateRecord extends BaseBean {
 
 	@Column(name = "ref_sn")
 	@ApiParam(value = "关联二维码")
-	private String refSN;
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String refSN;
 
 }