From a4e42a8ba7f1e129aacff98d1e1de2f7a4e41804 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 19 Jun 2023 14:06:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/feedback/controller/FeedbackController.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/feedback/controller/FeedbackController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/feedback/controller/FeedbackController.java
index f0ed85b..fd85d21 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/feedback/controller/FeedbackController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/feedback/controller/FeedbackController.java
@@ -33,9 +33,7 @@
@ApiOperation(value = "列表", notes = "传入实体类参数")
public R<IPage<FeedbackVO>> pageList(FeedbackVO feedBack, Query query) {
// IPage<Feedback> pageList = feedbackService.page(Condition.getPage(query),Condition.getQueryWrapper(feedBack));
-
IPage<FeedbackVO> page = feedbackService.selectPage(Condition.getPage(query),feedBack);
-
return R.data(page);
}
--
Gitblit v1.9.3