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 7c32d1a..b945951 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,8 +87,6 @@ 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; @@ -521,20 +519,4 @@ 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; - } }