diff --git a/src/test.txt b/src/test.txt index 1565f000..daebe1b9 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -Merge remote-tracking branch 'origin/V20220830' into res-manage-v2 +Merge pull request '国际化信息合入' (#2800) from zouap_static into V20220830