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 4495b81e56 - Show all commits

14
.collaboration
View File

@@ -635,7 +635,19 @@
}, },
{ {
"ModuleName": "UserControlPage/工时记录列表", "ModuleName": "UserControlPage/工时记录列表",
"ModuleType": 31 "State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:27:48.5369652+08:00",
"ModuleType": 31,
"ToRemoveFiles": [
"UserControlPages\\工时记录列表.json",
"UserControlPages\\工时记录列表.rd",
"Pages\\36d33d0079644f28b16bd0fec90394c.json",
"Pages\\36d33d0079644f28b16bd0fec90394c.rd"
]
}, },
{ {
"ModuleName": "ServerCommands/任务", "ModuleName": "ServerCommands/任务",