From 975823f4d07c91a67162f553be9ff4ac25f3d47d Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期四, 06 十一月 2025 13:41:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/czkhasrs' into czkhasrs
---
src/main/java/com/zy/system/controller/UserController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 2dd0186..893ee88 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -149,13 +149,13 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
- wrapper.like("matnr", condition);
+ wrapper.like("maktx", condition);
Page<Mat> page = matService.selectPage(new Page<>(0, 50), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Mat mat : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", mat.getId());
- map.put("value", mat.getMaktx());
+ map.put("value", mat.getMatnr());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1