Merge remote-tracking branch 'origin/master' into master

zengh

2021-02-03 5a90071cd2797bcacc286fcad31a8b0b0875d6aa

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java

@@ -141,6 +141,7 @@
    * @param endTime
    * @return
    */
   @PostMapping("/selectList")
   public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String waringType, String beginTime, String endTime, String addvcd, String type, HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");