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

23
.collaboration
View File

@@ -855,11 +855,30 @@
}, },
{ {
"ModuleName": "MasterPages/FGC_页面模板文件夹", "ModuleName": "MasterPages/FGC_页面模板文件夹",
"ModuleType": 24 "State": 2,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-18T17:43:14.0498848+08:00",
"ModuleType": 24,
"ToRemoveFiles": [
"MasterPages\\FGC_页面模板文件夹"
]
}, },
{ {
"ModuleName": "MasterPCPage/FGC_页面模板_母版页", "ModuleName": "MasterPCPage/FGC_页面模板_母版页",
"ModuleType": 3 "State": 2,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-18T17:43:14.0499913+08:00",
"ModuleType": 3,
"ToRemoveFiles": [
"MasterPages\\FGC_页面模板文件夹\\FGC_页面模板_母版页.json",
"MasterPages\\FGC_页面模板文件夹\\FGC_页面模板_母版页.rd"
]
}, },
{ {
"ModuleName": "UserControlPage/工时记录列表", "ModuleName": "UserControlPage/工时记录列表",