From be35fc91e03cb078e5a7a3354664b571e0d3ec89 Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期六, 07 六月 2025 15:38:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms --- src/main/java/com/zy/asrs/controller/MatController.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java index 1c6b93f..d034093 100644 --- a/src/main/java/com/zy/asrs/controller/MatController.java +++ b/src/main/java/com/zy/asrs/controller/MatController.java @@ -69,7 +69,7 @@ EntityWrapper<Mat> wrapper = new EntityWrapper<>(); if (!Cools.isEmpty(condition)) { // wrapper.like("matnr", condition).or().like("maktx", condition); - wrapper.like("matnr", condition).or().like("specs", condition); + wrapper.like("matnr", condition).or().like("specs", condition).or().like("maktx", condition); } wrapper.orderBy("create_time", false); List<Mat> mats = matService.selectList(wrapper); -- Gitblit v1.9.1