Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-07-12 8aa4448ea65b5ef86689bd15c6b895afc99d17d0

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java

@@ -254,7 +254,7 @@
    * @param patrolTask 任务
    */
   @PostMapping("patrol-done-list")
   @ApiOperation(value = "查询待办")
   @ApiOperation(value = "查询已办")
   public R patrolDoneList(PatrolTaskVO patrolTask, Query query) {
      BladeFlowVO bladeFlow2 = new BladeFlowVO();
      //设置流程类型