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

24
.collaboration
View File

@@ -382,17 +382,7 @@
}, },
{ {
"ModuleName": "PCPage/FGC_登录", "ModuleName": "PCPage/FGC_登录",
"State": 1, "ModuleType": 1
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-07-31T09:53:33.8109852+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\内建页面\\FGC_登录.json",
"Pages\\内建页面\\FGC_登录.rd"
]
}, },
{ {
"ModuleName": "PCPage/FGC_维护中", "ModuleName": "PCPage/FGC_维护中",
@@ -880,17 +870,7 @@
}, },
{ {
"ModuleName": "MasterPCPage/FGC_母版页", "ModuleName": "MasterPCPage/FGC_母版页",
"State": 1, "ModuleType": 3
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-07-31T09:53:01.6264799+08:00",
"ModuleType": 3,
"ToRemoveFiles": [
"MasterPages\\FGC_母版页.json",
"MasterPages\\FGC_母版页.rd"
]
}, },
{ {
"ModuleName": "MasterPages/流程母版页面文件夹", "ModuleName": "MasterPages/流程母版页面文件夹",