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

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/vo/DamStationStatistics.java

@@ -13,12 +13,18 @@
    */
   private String resCd;


   /**
    * 水库名称
    */
   private String resName;

   /**
    * 水库注册码
    */
   private String resRegCode;

   /**
    * 地市
    */
   private String cityName;