From bebea951bb2aa3f1101da97387c21f03650aa332 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 23 十二月 2024 15:27:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-web/pipIrr-web-temp/说明.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/\350\257\264\346\230\216.txt" "b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/\350\257\264\346\230\216.txt"
index d10e184..8a89873 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/\350\257\264\346\230\216.txt"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/\350\257\264\346\230\216.txt"
@@ -15,5 +15,5 @@
 /temp/chSome/changeSomeIntakeDayAmount
 5銆侀噸鏂扮粺璁″彇姘村彛鏈堝彇姘撮噺锛堟墽琛屽墠鍏抽棴閫氫俊涓棿浠讹級
 /temp/chSome/reStatisticsAllIntakeMonthAmount
-6銆侀噸鏂扮粺璁″彇姘村彛鎵�鍙栨按閲忥紙鎵ц鍓嶅叧闂�氫俊涓棿浠讹級
+6銆侀噸鏂扮粺璁″彇姘村彛骞村彇姘撮噺锛堟墽琛屽墠鍏抽棴閫氫俊涓棿浠讹級
 /temp/chSome/reStatisticsAllIntakeYearAmount
\ No newline at end of file

--
Gitblit v1.8.0