Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java

@@ -101,7 +101,7 @@
         workReport.setReportTime(new Date());
         workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
      }
      arg.test01(arg.url+"/workReport/submit",workReport);
      //arg.test01(arg.url+"/workReport/submit",workReport);
      return R.status(workReportService.saveOrUpdate(workReport));
   }

@@ -111,7 +111,7 @@
    */
   @PostMapping("/remove")
   public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
      arg.sendPostRemoveByIds(arg.url+"/workReport/remove",ids);
      //arg.sendPostRemoveByIds(arg.url+"/workReport/remove",ids);
      return R.status(workReportService.removeByIds(Func.toLongList(ids)));
   }