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

guoshilong

2023-07-05 abaf72a337248943e037b02d069c094e2ee5d60b

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

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

   @Override