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

6
.collaboration
View File

@@ -923,7 +923,7 @@
"UserName": "cuckooent", "UserName": "cuckooent",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-09-04T19:28:03.8643352+08:00", "LockDateTime": "2024-09-04T19:32:17.6423874+08:00",
"ModuleType": 1, "ModuleType": 1,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Pages\\个人中心\\个人中心-基本信息.json", "Pages\\个人中心\\个人中心-基本信息.json",
@@ -2398,13 +2398,13 @@
"ModuleType": 27 "ModuleType": 27
}, },
{ {
"ModuleName": "ServerCommand/绑定或解绑钉钉UnionId", "ModuleName": "ServerCommand/绑定钉钉UnionId",
"State": 3, "State": 3,
"LockedBy": { "LockedBy": {
"UserName": "cuckooent", "UserName": "cuckooent",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-09-04T19:24:31.0034294+08:00", "LockDateTime": "2024-09-04T19:32:17.6420983+08:00",
"ModuleType": 15 "ModuleType": 15
}, },
{ {