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

16
.collaboration
View File

@@ -744,7 +744,17 @@
}, },
{ {
"ModuleName": "PCPage/任务-基本信息", "ModuleName": "PCPage/任务-基本信息",
"ModuleType": 1 "State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-18T17:57:54.5602261+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\任务\\任务-基本信息.json",
"Pages\\任务\\任务-基本信息.rd"
]
}, },
{ {
"ModuleName": "PCPage/任务-任务信息", "ModuleName": "PCPage/任务-任务信息",
@@ -1095,7 +1105,7 @@
"UserName": "超哥", "UserName": "超哥",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-06-18T17:40:54.8608366+08:00", "LockDateTime": "2024-06-18T17:57:54.5599109+08:00",
"ModuleType": 15, "ModuleType": 15,
"ToRemoveFiles": [ "ToRemoveFiles": [
"ServerCommands\\任务\\变更任务状态.json" "ServerCommands\\任务\\变更任务状态.json"
@@ -2075,7 +2085,7 @@
"UserName": "超哥", "UserName": "超哥",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-06-18T14:35:03.3248705+08:00", "LockDateTime": "2024-06-18T17:57:54.5602317+08:00",
"ModuleType": 28, "ModuleType": 28,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Process\\新增任务流程.json", "Process\\新增任务流程.json",