From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/task/handler/AutoMoveCreateExecuteHandler.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveCreateExecuteHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveCreateExecuteHandler.java
index 6a43f32..866b082 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveCreateExecuteHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveCreateExecuteHandler.java
@@ -28,7 +28,7 @@
try{
if (wrkMastExecuteService.insert(wrkMastExecute)){
agvWrkMast.setWrkSts(agvWrkMast.getWrkSts()+1);
- agvWrkMast.setAppeTime(new Date());
+ agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
}
}catch (Exception e){
--
Gitblit v1.9.1