Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

zhongrj

2023-07-06 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee

 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);
   }