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

35
.collaboration
View File

@@ -771,7 +771,17 @@
},
{
"ModuleName": "PCPage/新增任务",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-19T14:59:44.0421175+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\任务\\新增任务.json",
"Pages\\任务\\新增任务.rd"
]
},
{
"ModuleName": "PCPage/新增进展",
@@ -2113,7 +2123,16 @@
},
{
"ModuleName": "ServerCommand/新增任务",
"ModuleType": 15
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-19T14:59:44.0417525+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\任务\\新增任务.json"
]
},
{
"ModuleName": "TaskScheduler/仓库新增事件",
@@ -2196,7 +2215,17 @@
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-19T14:28:14.8978632+08:00",
"LockDateTime": "2024-06-19T14:59:44.0424109+08:00",
"ModuleType": 1
},
{
"ModuleName": "ServerCommand/任务流程发起前校验",
"State": 3,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-19T14:59:44.0417622+08:00",
"ModuleType": 15
}
]