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

ke

2024-08-19 c5f6f451fcd2a5257315590c5a256766fa68e433

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java

@@ -334,9 +334,6 @@
      if (StringUtil.isNotBlank(flse_lim_stag)) {
         detailList.add(StringUtil.format("汛限水位{}米", flse_lim_stag));
      }
      if (StringUtil.isNotBlank(flse_lim_stag)) {
         detailList.add(StringUtil.format("汛限水位{}米", flse_lim_stag));
      }
      if (StringUtil.isNotBlank(control_z)) {
         detailList.add(StringUtil.format("控制运用水位{}米", control_z));
      }