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/service/IAttResBaseService.java

@@ -50,4 +50,6 @@
    * @return
    */
   AttResAdVO getWaterRegionInfoByResGuid(String guid);

   int getDimResInfoACount();
}