Merge remote-tracking branch 'origin/master'

tangzy

2021-03-23 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e

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

@@ -79,4 +79,19 @@
   }


   /**
    * 获取包裹违禁品明细分页数据，远程调用api获取数据
    * @param conditionVo  请求参数对象
    * @param response
    * @return
    */
   @GetMapping("/getParcelkindDetailPage")
   public R getParcelkindDetailPage(ConditionVo conditionVo,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.getParcelkindDetailPage(conditionVo));
   }


}