From adc03660c3592d4d87076c4fefcbb86280610c4a Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 25 八月 2021 13:29:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs
---
src/main/java/com/zy/ints/controller/WaitMatinController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/ints/controller/WaitMatinController.java b/src/main/java/com/zy/ints/controller/WaitMatinController.java
index a6520af..aca57b3 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatinController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatinController.java
@@ -57,7 +57,7 @@
@ManagerAuth
public R getMatDataKV(@RequestParam(required = false) String condition) {
Wrapper<MatCode> wrapper = new EntityWrapper<MatCode>()
- .andNew().like("mat_no", condition).or().like("mat_name", condition)
+ .andNew().like("matnr", condition).or().like("maktx", condition)
.orderBy("create_time", false);
List<MatCode> mats = matCodeService.selectPage(new Page<>(1, 30), wrapper).getRecords();
List<KeyValueVo> valueVos = new ArrayList<>();
--
Gitblit v1.9.1