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

xieb

2024-01-24 e143a763c75da7cc020bf19259256c8155b5da96

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

@@ -55,4 +55,6 @@
   AttResAdVO getWaterRegionInfoByResGuid(String guid);

   int getDimResInfoACount();

    Boolean updateIsShowStatus(String ids, Integer status);
}