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

@@ -17,4 +17,6 @@
   IPage<PatrolGroupItemVO> selectPatrolConfig(IPage<PatrolGroupItemVO> page, PatrolGroupItemVO patrolGroupItem);

    PatrolGroupItemVO getPatrolGroupItemVOById(Long id);

    List<PatrolGroupItem> getItemByItemIds(String itemIds,String groupId);
}