Merge remote-tracking branch 'origin/master'

zengh

2021-03-23 ba0f00cf00c2a5c693e9608a56d1f7d032f5e216

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

@@ -64,6 +64,34 @@
      return R.data(parcelService.getParcelPic(imgUrl));
   }

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


   /**
    * 获取包裹违禁品明细分页数据，远程调用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));
   }


}