Merge remote-tracking branch 'origin/master'

zengh

2021-06-23 9a8d3f7ad2717fd6089e43fb5de9dc4815877d9b

 src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java

@@ -90,7 +90,7 @@
      }
      wj.setSid(feedback.getId());
      //查询基本信息
      map.put("feedback",feedbackService.getOne(Condition.getQueryWrapper(feedback)));
      map.put("feedback",feedbackService.getFeedbackById(feedback.getId()));
      //获取图片
      wj.setType(1);
      map.put("images",iWjService.selectResouces(wj));