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

zhongrj

2023-04-24 684d583978a4f0d4b0bd88ad46ad2f6238d185c8

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

@@ -156,4 +156,20 @@
   public R getAllPatrolGroupByTaskId(String taskId) {
      return R.data(patrolGroupService.getAllPatrolGroupByTaskId(taskId));
   }

   /**
    * 根据任务id获取巡查组，返回组下的record
    */
   @GetMapping(value = "/getPatrolGroupDTO")
   public R getPatrolGroupDTO(String taskId) {
      return R.data(patrolGroupService.getPatrolGroupDTO(taskId));
   }

   /**
    * 根据任务id获取巡查组
    */
   @GetMapping(value = "/getPatrolGroupByTaskId")
   public R getPatrolGroupByTaskId(String taskId) {
      return R.data(patrolGroupService.getPatrolGroupByTaskId(taskId));
   }
}