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

guoshilong

2023-09-11 b6a42ed2c7bb93651a9a026afb3ee83449ed8256

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

@@ -43,4 +43,11 @@
    * @return
    */
    List<Map<String, Object>> getAllWaterFillInfoByResGuid(String resGuid);

   /**
    * 更新水库信息填报最终状态
    * @param resGuid 水库编码
    * @param state 状态值
    */
   Boolean updateFinalState(String resGuid, int state);
}