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/mapper/PatrolTaskMapper.java

@@ -46,4 +46,6 @@
    * @return
    */
   PatrolTask getPatrolTaskById(@Param("id")String id);

    PatrolTask customizeGetById(@Param("id") String id);
}