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

guoshilong

2023-12-06 604a30ce5ecc725427bb1e384abdbdf777a4074b

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

@@ -59,4 +59,10 @@
    * @return
    */
    AttResAdVO getWaterRegionInfoByResGuid(@Param("guid") String guid);

   /**
    * 获取水库基本信息表DimResInfo总数
    * @return
    */
   int getDimResInfoACount();
}