From fff2717c3f160fa1c5724f1f39e42fb41d0cd012 Mon Sep 17 00:00:00 2001 From: taeyeon Date: Tue, 29 Apr 2025 13:58:55 +0800 Subject: [PATCH 1/2] Merge remote-tracking branch 'origin/edu/Manger' into edu/Manger --- src/main/java/com/controller/KechengleixingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/controller/KechengleixingController.java b/src/main/java/com/controller/KechengleixingController.java index eab85c5..4621d83 100644 --- a/src/main/java/com/controller/KechengleixingController.java +++ b/src/main/java/com/controller/KechengleixingController.java @@ -78,7 +78,7 @@ public class KechengleixingController { * 列表 */ @RequestMapping("/lists") - public R list( KechengleixingEntity kechengleixing){ + public R list( KechengleixingEntity kechengleixing){ //测试 EntityWrapper ew = new EntityWrapper(); ew.allEq(MPUtil.allEQMapPre( kechengleixing, "kechengleixing")); return R.ok().put("data", kechengleixingService.selectListView(ew)); -- 2.34.1 From 698ebe7269d26574c0796046443d8d139d01f1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=B1=95=E6=9C=9B?= Date: Tue, 29 Apr 2025 14:11:13 +0800 Subject: [PATCH 2/2] Merge remote-tracking branch 'origin/edu/Manger' into edu/Manger --- src/main/java/com/controller/ExamquestionController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/controller/ExamquestionController.java b/src/main/java/com/controller/ExamquestionController.java index a8b8e03..f34f974 100644 --- a/src/main/java/com/controller/ExamquestionController.java +++ b/src/main/java/com/controller/ExamquestionController.java @@ -60,7 +60,7 @@ public class ExamquestionController { EntityWrapper ew = new EntityWrapper(); PageUtils page = examquestionService.queryPage(params, MPUtil.sort(MPUtil.between(MPUtil.likeOrEq(ew, examquestion), params), params)); - return R.ok().put("data", page); + return R.ok().put("data", page);//测试 } /** -- 2.34.1