Merge branch 'develop' of gitadmin/tuoheng_qmhh into release

tuoheng-api/src/main/java/com/tuoheng/api/entity/domain/Feedback.java

      */
     private String handleRemark;
 
+    /**
+     * 反馈类型：1全民护河 2河湖长
+     */
+    private Integer type;
+
+    /**
+     * 视频地址
+     */
+    private String videoUrl;
+
+    /**
+     * 问题类型 1水面 2岸线 3水质 4排口
+     */
+    private Integer questionType;
+
     /**
      * 处理时间
      */

tuoheng-api/src/main/java/com/tuoheng/api/service/impl/FeedbackServiceImpl.java

             feedback.setStreamName(stream.getName());
             feedback.setStreamAdminId(stream.getStreamAdminId());
             feedback.setStreamAdminName(stream.getStreamAdminName());
+            feedback.setType(1);
         }else {
             return JsonResult.error("河流信息不存在");
         }
         IPage<Feedback> pageData = feedbackMapper.selectPage(page, new LambdaQueryWrapper<Feedback>()
                 .eq(Feedback::getMark, 1)
                 .eq(Feedback::getOpenid, query.getOpenid())
+                .eq(Feedback::getType,1)
                 .orderByDesc(Feedback::getCreateTime));
         pageData.getRecords().stream().map(vo -> {
             Stream stream = streamMapper.selectById(vo.getStreamId());