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/mapper/AgvWaitPakinLogMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWaitPakinLogMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWaitPakinLogMapper.java
index 4175ed8..e272f93 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWaitPakinLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWaitPakinLogMapper.java
@@ -10,7 +10,7 @@
@Repository
public interface AgvWaitPakinLogMapper extends BaseMapper<AgvWaitPakinLog> {
- @Insert("insert into agv_cust_wait_pakin_log select * from agv_cust_wait_pakin where zpallet=#{zpallet}")
+ @Insert("insert into agv_cust_wait_pakin_log select * from agv_cust_wait_pakin where supp_code=#{zpallet}")
int save(String zpallet);
}
--
Gitblit v1.9.1