Merge remote-tracking branch 'origin/master'

zengh

2021-03-12 70f01fd17bb642c2f773d5c5567018d7573a2dde

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java

@@ -41,6 +41,7 @@
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;

@@ -221,4 +222,18 @@
      return R.success("删除成功");
   }

   /**
    * APP警情反馈信息
    * @param response
    * @return
    */
   @PostMapping("/selectFeedEdit")
   public R selectFeedEdit(HttpServletResponse response,String jid) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      List<FeedbackVO> feedbackVOS = feedbackService.selectFeedEdit(jid);
      return R.data(feedbackVOS);
   }

}