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/PatrolRecordController.java

@@ -151,5 +151,4 @@
      List<PatrolRecord> list = patrolRecordService.getByTaskIdAndGroupId(groupId,taskId);
      return R.data(list);
   }

}