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

14
.collaboration
View File

@@ -2466,12 +2466,12 @@
}, },
{ {
"ModuleName": "PCPage/发起钉钉会议", "ModuleName": "PCPage/发起钉钉会议",
"State": 1, "State": 2,
"LockedBy": { "LockedBy": {
"UserName": "cuckooent", "UserName": "cuckooent",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-09-24T13:19:59.6842631+08:00", "LockDateTime": "2024-09-24T13:28:34.0749287+08:00",
"ModuleType": 1, "ModuleType": 1,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Pages\\共用\\发起钉钉会议.json", "Pages\\共用\\发起钉钉会议.json",
@@ -2495,5 +2495,15 @@
}, },
"LockDateTime": "2024-09-24T13:27:50.111796+08:00", "LockDateTime": "2024-09-24T13:27:50.111796+08:00",
"ModuleType": 38 "ModuleType": 38
},
{
"ModuleName": "PCPage/发起钉钉项目会议",
"State": 3,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-09-24T13:28:34.0749531+08:00",
"ModuleType": 1
} }
] ]