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

zhongrj

2023-04-03 f7961d26a2626136ecc6803a655ee85e39533cea

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

@@ -22,4 +22,6 @@
    * @return
    */
   List<PatrolGroupItemVO> getPatrolRecordByTaskId(String taskId, String itemIds);

   List<PatrolRecordVO> getByTaskIdAndItemId(String taskId, String itemIds);
}