From 6c264ce8c372e18109f0a3b9f5754955d22ba353 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 15 十一月 2023 17:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java
index cdf900c..108f4b3 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java
@@ -37,6 +37,9 @@
@Data
public class CustomerOrderDTO extends CustomerOrder implements Serializable {
+ @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ private LocalDateTime deliveryDate;
+
@ApiModelProperty(value = "涓嬪彂闇�姹傛暟閲�")
private BigDecimal requireNumber;
@@ -118,7 +121,7 @@
private List<Long> customerOrderIds;
@ApiModelProperty(value = "瀹㈡埛璁㈠崟鍙�")
- private String customerContractNo;
+ private String customerOrderNo;
@ApiModelProperty(value = "绛捐鏃ユ湡")
private LocalDateTime placeOrderDate;
@@ -137,8 +140,5 @@
@ApiModelProperty(value = "缁堟鏃ユ湡")
private LocalDateTime endTime;
-
- @ApiModelProperty(value = "闇�姹傛棩鏈�")
- private LocalDateTime deliveryDate;
}
--
Gitblit v1.9.3