diff --git a/src/test.txt b/src/test.txt index 88273102..dc7b544f 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -Merge remote-tracking branch 'origin/V20220908' into point-v2 +Merge pull request '资源管理二期' (#2874) from res-manage-v2 into V20220908