健康码，警单

nnnjjj123

2021-02-07 ff9019e43ba8b80d2337cfc00468987c4642b494

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

@@ -142,11 +142,11 @@
    * @return
    */
   @PostMapping("/selectList")
   public R<IPage<JingdanVO>> selectList(@ApiParam(value = "主键集合", required = true) @RequestParam Query query  ,String waringType, String beginTime, String endTime, String addvcd, String type, HttpServletResponse response) {
   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");
      response.setHeader("Access-Control-Allow-Credentials","true");
      return R.data(jingdanService.selectList(Condition.getPage(query),waringType, beginTime, endTime,addvcd,type));
      return R.data(jingdanService.selectList(waringType, beginTime, endTime,addvcd,type));
   }

   /**
@@ -233,10 +233,7 @@
   }

   @PostMapping("/updateInfo")
   public R updateInfo(String id, String handleP, String handName, String handletype, String type, 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");
   public R updateInfo(String id, String handleP, String handName, String handletype, String type) {
      jingdanService.updateInfo(id, handleP, handName,handletype,type);
      return R.success("修改成功");
   }