Merge remote-tracking branch 'origin/master'

tangzy

2021-03-22 439480489111ecb1863e2ad0ceb2ff18150366ef

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java

@@ -50,5 +50,20 @@
      return R.data(parcelService.getParcelStatis(conditionVo));
   }

   /**
    * 获取图片地址
    * @param imgUrl  图片url
    * @param response
    * @return
    */
   @GetMapping("/getParcelPic")
   public R getParcelPic(String imgUrl,HttpServletResponse response){
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      return R.data(parcelService.getParcelPic(imgUrl));
   }



}