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/vo/CustomerOrderVO2.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java
index 6fa7da7..b3a6ba9 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java
@@ -14,7 +14,7 @@
 	private Long id;
 
 	//鍚堝悓缂栧彿
-	private String customerOrderNo;
+	private String contractNo;
 
 	//宸ョ▼鍚嶇О
 	private String entityName;

--
Gitblit v1.9.3