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

ke

2024-08-27 f73dbcd6c21d28ab1e98840eee73c6d09bd0f929

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java

@@ -64,6 +64,10 @@
                                           @Param("cityCode") String cityCode,
                                           @Param("type") String type);

   List<PersonVO> getCityCountyPersonListNewByResGuid(@Param("countyCode") String countyCode,
                                       @Param("cityCode") String cityCode,
                                       @Param("type") String type);

   List<PatrolResponsiblePerson> getPatrolResponsiblePersonByResCdList(@Param("ids") List<String> reservoirList);

   /**