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

xieb

2024-02-29 4792ec396bca8d4aca1ce4dd88b1c7433fd347af

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

@@ -121,8 +121,13 @@
            this.hour,total,big,mid,small,dangerCountTotal,overDangerCountTotal);

      String totalOverNormal10Value = getOverNormal10(totalOver10List);
      String smallValue = "";
      if (smallList.size()>0){
         smallValue = String.join("、",smallList);
      }else {
         smallValue = "没有超正常的小型水库";
      }

      String smallValue = String.join("、",smallList);
      String bigValue="";
      if (bigList.size()>0){
         bigValue=