关务保税仓页面查询；

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java

@@ -213,10 +213,10 @@ public class PickingOrderDO extends BaseVOEntity {
     @ApiModelProperty(value = "推送时间起")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeStart;
+    private Date pushTimeFrom;
 
     @ApiModelProperty(value = "推送时间止")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeEnd;
+    private Date pushTimeTo;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java

@@ -413,10 +413,10 @@ public class StockInOrderDO extends BaseVOEntity {
     @ApiModelProperty(value = "推送时间起")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeStart;
+    private Date pushTimeFrom;
 
     @ApiModelProperty(value = "推送时间止")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeEnd;
+    private Date pushTimeTo;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java

@@ -471,4 +471,13 @@ public class StockOutOrderDO extends BaseVOEntity {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeFrom;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeTo;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java

@@ -158,10 +158,10 @@ public class StockShelfOrderDO extends StockInOrderBaseDO {
     @ApiModelProperty(value = "推送时间起")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeStart;
+    private Date pushTimeFrom;
 
     @ApiModelProperty(value = "推送时间止")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeEnd;
+    private Date pushTimeTo;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java

@@ -181,10 +181,10 @@ public class PickingOrderDTO extends BaseVOEntity {
     @ApiModelProperty(value = "推送时间起")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeStart;
+    private Date pushTimeFrom;
 
     @ApiModelProperty(value = "推送时间止")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeEnd;
+    private Date pushTimeTo;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java

@@ -411,10 +411,10 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
     @ApiModelProperty(value = "推送时间起")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeStart;
+    private Date pushTimeFrom;
 
     @ApiModelProperty(value = "推送时间止")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeEnd;
+    private Date pushTimeTo;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java

@@ -465,4 +465,13 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeFrom;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeTo;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java

@@ -147,10 +147,10 @@ public class StockShelfOrderDTO extends StockInOrderBaseDTO {
     @ApiModelProperty(value = "推送时间起")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeStart;
+    private Date pushTimeFrom;
 
     @ApiModelProperty(value = "推送时间止")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTimeEnd;
+    private Date pushTimeTo;
 }