Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

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

@@ -66,25 +66,29 @@ public class WmsStockSn extends BaseBean {
     private String partNameRdd;
 
     @Column(name = "LOT_NO", nullable = false)
-    @ApiParam("收货日期（批次编码）")
+    @ApiParam("收货批次")
     public String lotNo = "";
 
     @Column(name = "DATE_CODE", nullable = false)
-    @ApiParam(value = "生产日期")
+    @ApiParam(value = "供应商批次")
     public String dateCode = "";
 
+    @Column(name = "FIX_LOT_NO", nullable = false)
+    @ApiParam(value = "特殊批次")
+    private String fixLotNo = "";
+
+    @Column(name = "QUALITY_DATE")
+    @ApiParam("保质期")
+    private String qualityDate;
+
     @Column(name = "LEFT_CODE", nullable = false)
-    @ApiParam(value = "有效期")
+    @ApiParam(value = "生产批次")
     private String leftCode = "";
 
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
-    @Column(name = "FIX_LOT_NO", nullable = false)
-    @ApiParam(value = "特殊批次")
-    private String fixLotNo = "";
-
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编码")
     private String custNo;
@@ -163,10 +167,6 @@ public class WmsStockSn extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
     private Integer snType = 10;
 
-    @Column(name = "QUALITY_DATE")
-    @ApiParam("保质期日期")
-    private String qualityDate;
-
     @ApiParam(value = "仓库名称")
     @Transient
     public String whNameRdd;