admin/clue
1
0
Fork 0
Code Pull Requests 1 Actions Activity

WIP: 将最新版本合并至Master #1

Draft
admin wants to merge 3623 commits from 版本10 into master
pull from: 版本10
merge into: admin:master
Conversation 0 Commits 3623 Files Changed 1005 +11 -2
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2b96109e43 - Show all commits

13
.collaboration
View File

@@ -725,7 +725,7 @@
"UserName": "SHAMUSPC\\NINGMEI", "UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-04-24T15:28:55.3740562+08:00", "LockDateTime": "2024-04-24T15:30:14.3360397+08:00",
"ModuleType": 1, "ModuleType": 1,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Pages\\任务\\新增任务.json", "Pages\\任务\\新增任务.json",
@@ -1050,7 +1050,16 @@
}, },
{ {
"ModuleName": "ServerCommand/新增任务", "ModuleName": "ServerCommand/新增任务",
"ModuleType": 15 "State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-24T15:30:14.335691+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\任务\\新增任务.json"
]
}, },
{ {
"ModuleName": "ServerCommand/移除任务成员", "ModuleName": "ServerCommand/移除任务成员",