Merge remote-tracking branch 'ban/test' into testban

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

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

@@ -604,32 +604,6 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("打印类型")
     private Integer printType;
 
-    @Transient
-    @ApiParam("30天以下")
-    private double thirtyDays;
-
-    @Transient
-    @ApiParam("30-60天")
-    private double thirtyToSixtyDays;
-
-    @Transient
-    @ApiParam("60-90天")
-    private double sixtyToNinetyDays;
-
-    @Transient
-    @ApiParam("90天以上")
-    private double morhanDays;
-
-    public WmsStockSn(String zoneNo, String lotNo, String partNo, double thirtyDays, double thirtyToSixtyDays, double sixtyToNinetyDays, double morhanDays) {
-        this.zoneNo=zoneNo;
-        this.lotNo=lotNo;
-        this.partNo=partNo;
-        this.thirtyDays = thirtyDays;
-        this.thirtyToSixtyDays = thirtyToSixtyDays;
-        this.sixtyToNinetyDays = sixtyToNinetyDays;
-        this.morhanDays = morhanDays;
-    }
-
     public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z,
                       String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) {
         this.sn = sn;