From 14585f2697c1d42b98f5d9d8bb1ff62acea08341 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20221214' into zouap

---
 src/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test.txt b/src/test.txt
index e13a7705..b49043fe 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-修改用户年度报告数据获取方式
+Merge remote-tracking branch 'origin/V20221214' into zouap