diff --git a/src/test.txt b/src/test.txt index c349a0c5..6da3eecc 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -Merge branch 'V20220830' of git.openi.org.cn \ No newline at end of file +Merge pull request '资源管理一期' (#2780) from res-manage into V20220830