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/LocRuleMapper.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocRuleMapper.java b/src/main/java/com/zy/asrs/mapper/LocRuleMapper.java
index fe8dd2a..3786ba8 100644
--- a/src/main/java/com/zy/asrs/mapper/LocRuleMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocRuleMapper.java
@@ -11,8 +11,12 @@
@Repository
public interface LocRuleMapper extends BaseMapper<LocRule> {
- LocRule selectByMatnr(String matnr);
+ List<LocRule> selectByMatnr(String matnr);
- LocRule selectByMixed(Integer mixed);
+ List<LocRule> selectByMixed(Integer mixed);
+
+ int updateKeepGoByMatnr(String matnr, Integer keepGo);
+
+ int updateKeepGoByMixed(Integer keepGo);
}
--
Gitblit v1.9.1