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 +13 -1
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b669f7a85c - Show all commits

14
.collaboration
View File

@@ -958,7 +958,19 @@
}, },
{ {
"ModuleName": "UserControlPage/聊天列表", "ModuleName": "UserControlPage/聊天列表",
"ModuleType": 31 "State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-30T15:24:52.8534455+08:00",
"ModuleType": 31,
"ToRemoveFiles": [
"UserControlPages\\聊天列表.json",
"UserControlPages\\聊天列表.rd",
"Pages\\21293af3013f474faf264d978cf3501.json",
"Pages\\21293af3013f474faf264d978cf3501.rd"
]
}, },
{ {
"ModuleName": "ServerCommands/任务", "ModuleName": "ServerCommands/任务",