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

zhongrj

2023-05-11 ff7234ac1fefe573ae3f03667a748e3351ee6b1b

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

@@ -218,8 +218,10 @@
         List<BladeFlow> data = res.getData();
         data.forEach(bladeFlow -> {
            PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
            if (byId != null){
            byId.setFlow(bladeFlow);
            patrolTaskList.add(byId);
            }
         });
      }
      //设置数据集