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

26
.collaboration
View File

@@ -1242,7 +1242,17 @@
},
{
"ModuleName": "PCPage/工作台_关键信息",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-11-22T12:32:48.4464187+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\工作台\\工作台_关键信息.json",
"Pages\\工作台\\工作台_关键信息.rd"
]
},
{
"ModuleName": "Pages/客户",
@@ -2530,12 +2540,12 @@
},
{
"ModuleName": "PCPage/我的会议",
"State": 1,
"State": 2,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-11-22T12:31:09.0490151+08:00",
"LockDateTime": "2024-11-22T12:32:48.446361+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\工作台\\我的会议.json",
@@ -2613,5 +2623,15 @@
},
"LockDateTime": "2024-11-22T12:32:40.1777913+08:00",
"ModuleType": 6
},
{
"ModuleName": "PCPage/会议管理",
"State": 3,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-11-22T12:32:48.446371+08:00",
"ModuleType": 1
}
]