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

6
.collaboration
View File

@@ -946,7 +946,7 @@
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-25T19:52:40.7672285+08:00",
"LockDateTime": "2024-04-25T20:41:51.7723573+08:00",
"ModuleType": 3,
"ToRemoveFiles": [
"MasterPages\\FGC_母版页.json",
@@ -1566,13 +1566,13 @@
"ModuleType": 1
},
{
"ModuleName": "PCPage/个人工时首页",
"ModuleName": "PCPage/工时",
"State": 3,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-25T19:54:31.6254547+08:00",
"LockDateTime": "2024-04-25T20:41:51.7723752+08:00",
"ModuleType": 1
}
]