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

12
.collaboration
View File

@@ -1233,7 +1233,17 @@
}, },
{ {
"ModuleName": "MasterPCPage/FGC_母版页", "ModuleName": "MasterPCPage/FGC_母版页",
"ModuleType": 3 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-09-05T12:06:11.1953201+08:00",
"ModuleType": 3,
"ToRemoveFiles": [
"MasterPages\\FGC_母版页.json",
"MasterPages\\FGC_母版页.rd"
]
}, },
{ {
"ModuleName": "UserControlPage/工时记录列表", "ModuleName": "UserControlPage/工时记录列表",