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

guoshilong

2024-02-26 e7757e49c6ef8e56cfb62b2348d61d9548ddb3b8

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java

@@ -377,7 +377,7 @@
      // 根据水库名称、所在区域查询改水库的数量
      Integer number = attResBaseService.getWaterCountByResNameAndCountyName(hk.getRegionName(),info.getCountyCode());
      if (number>1){
         return info.getTownName() + hk.getRegionName();
         return  hk.getRegionName() + "(" + info.getTownName() + ")";
      }else {
         return hk.getRegionName();
      }