From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突

---
 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 fb0ed88..07864aa 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -651,6 +651,7 @@
             if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
                 //灏嗗伐浣滃厷鐘舵�佹敼涓鸿揣鏋剁鍦�
                 agvWrkMast.setWrkSts(206L);
+                agvWrkMast.setModiTime(new Date());
                 agvWrkMastService.updateById(agvWrkMast);
 //                //鍙戦�佽揣鏋剁珛鍦鸿姹傦紝瀹屾垚宸ヤ綔妗�
 //                List<AgvWrkMast> agvWrkMastList = new ArrayList<>();

--
Gitblit v1.9.1