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

28
.collaboration
View File

@@ -545,7 +545,7 @@
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-24T13:28:14.5390548+08:00",
"LockDateTime": "2024-04-24T15:28:55.3744243+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json",
@@ -688,7 +688,19 @@
},
{
"ModuleName": "PCPage/任务-子任务列表",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-24T15:28:55.3741785+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\任务\\任务-子任务列表.json",
"Pages\\任务\\任务-子任务列表.rd",
"Pages\\558ca610fafc4ffd8884b819161bfd6.json",
"Pages\\558ca610fafc4ffd8884b819161bfd6.rd"
]
},
{
"ModuleName": "PCPage/任务-工时",
@@ -708,7 +720,17 @@
},
{
"ModuleName": "PCPage/新增任务",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-24T15:28:55.3740562+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\任务\\新增任务.json",
"Pages\\任务\\新增任务.rd"
]
},
{
"ModuleName": "PCPage/新增进展",