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

23
.collaboration
View File

@@ -1256,7 +1256,7 @@
"UserName": "SHAMUSPC\\NINGMEI", "UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-04-24T15:14:15.0303366+08:00", "LockDateTime": "2024-04-24T15:50:07.5087717+08:00",
"ModuleType": 15, "ModuleType": 15,
"ToRemoveFiles": [ "ToRemoveFiles": [
"ServerCommands\\项目\\同步项目成员.json" "ServerCommands\\项目\\同步项目成员.json"
@@ -1264,7 +1264,16 @@
}, },
{ {
"ModuleName": "ServerCommand/同步项目参与人字段", "ModuleName": "ServerCommand/同步项目参与人字段",
"ModuleType": 15 "State": 2,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-24T15:50:07.5087411+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\项目\\同步项目参与人字段.json"
]
}, },
{ {
"ModuleName": "ServerCommands/用户", "ModuleName": "ServerCommands/用户",
@@ -1873,5 +1882,15 @@
}, },
"LockDateTime": "2024-04-24T12:59:59.3660172+08:00", "LockDateTime": "2024-04-24T12:59:59.3660172+08:00",
"ModuleType": 1 "ModuleType": 1
},
{
"ModuleName": "ServerCommand/同步项目参与人列表",
"State": 3,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-24T15:50:07.5087456+08:00",
"ModuleType": 15
} }
] ]