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

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java

@@ -81,7 +81,7 @@
    * @return
    */
   @Override
   public List<PersonVO> getUserListByResGuid(String res_cd,String areaList) {
   public List<PersonVO> getUserListByResGuid(String res_cd, String areaList) {
      return adBaseService.getPersonListByResGuid(res_cd,areaList);
   }