diff --git a/src/test.txt b/src/test.txt index ce4bb117..d125b50f 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -Merge branch 'V20211018' into liuzx_dev +Merge pull request '云脑任务删除权限判断' (#524) from judge_job_del into V20211018