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

28
.collaboration
View File

@@ -244,7 +244,7 @@
"UserName": "SHAMUSPC\\NINGMEI", "UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-03-05T18:24:09.6915666+08:00", "LockDateTime": "2024-03-05T18:30:15.995138+08:00",
"ModuleType": 1, "ModuleType": 1,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Pages\\任务\\任务-工时.json", "Pages\\任务\\任务-工时.json",
@@ -323,7 +323,17 @@
}, },
{ {
"ModuleName": "PCPage/右键菜单1", "ModuleName": "PCPage/右键菜单1",
"ModuleType": 1 "State": 2,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:30:15.9947793+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\共用\\右键菜单1.json",
"Pages\\共用\\右键菜单1.rd"
]
}, },
{ {
"ModuleName": "PCPage/项目菜单", "ModuleName": "PCPage/项目菜单",
@@ -598,7 +608,7 @@
"UserName": "SHAMUSPC\\NINGMEI", "UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-03-05T18:29:40.9949883+08:00", "LockDateTime": "2024-03-05T18:30:15.9950234+08:00",
"ModuleType": 1, "ModuleType": 1,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Pages\\项目首页\\项目列表.json", "Pages\\项目首页\\项目列表.json",
@@ -652,7 +662,7 @@
"UserName": "SHAMUSPC\\NINGMEI", "UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-03-05T18:27:48.5369652+08:00", "LockDateTime": "2024-03-05T18:30:15.9950672+08:00",
"ModuleType": 31, "ModuleType": 31,
"ToRemoveFiles": [ "ToRemoveFiles": [
"UserControlPages\\工时记录列表.json", "UserControlPages\\工时记录列表.json",
@@ -951,5 +961,15 @@
{ {
"ModuleName": "PublishSetting", "ModuleName": "PublishSetting",
"ModuleType": 41 "ModuleType": 41
},
{
"ModuleName": "PCPage/编辑删除菜单",
"State": 3,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:30:15.994793+08:00",
"ModuleType": 1
} }
] ]