diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrder.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrder.java index b945951..7c32d1a 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrder.java +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrder.java @@ -19,9 +19,9 @@ public class SearchShopOrder extends QueryPage { private String status; private String customerID; private String customerName; - private Date planStartDate; @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") + private Date planStartDate; private Double leadtime; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") @@ -87,6 +87,8 @@ public class SearchShopOrder extends QueryPage { private String user; private String batchNo; private String buNo; + private String startDate; + private String endDate; public String getOrderNo() { return orderNo; @@ -519,4 +521,20 @@ public class SearchShopOrder extends QueryPage { public void setBuNo(String buNo) { this.buNo = buNo; } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } }