From 7bea8428d74527993cb4ae47d01c79850b5f34bc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 20 三月 2023 08:09:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/common/web/WcsController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3652900..565d014 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -142,6 +142,7 @@
if(waitPakins.size()>0) {
WaitPakin one = waitPakins.get(0);
wrkMast.setFrozen(one.getFrozen());
+ wrkMast.setMemo(one.getMemo());
}
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
--
Gitblit v1.9.1