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

yxm

2024-07-08 13fe077a746a8dd090158a93d367e02bee41f2c7

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

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java

@@ -173,8 +173,8 @@
        }

        //昨日报汛
        params.put("昨日全省水库超汛限", "昨日全省水库超汛限:" + info.getTotalInfo().replace("今日", "昨日"));
        params.put("昨日超汛限的小型水库有", "昨日超汛限的小型水库有:" + info.getOversmallInfo());
        params.put("昨日全省水库超汛限", info.getTotalInfo().replace("今日", "昨日"));
        params.put("昨日超汛限的小型水库有", info.getOversmallInfo());

        return params;
    }