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

50
.collaboration
View File

@@ -604,7 +604,19 @@
},
{
"ModuleName": "PCPage/项目版本管理",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-18T10:41:26.7572867+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.json",
"Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.rd",
"Pages\\97bdc47834844e0d8f3a5aef747785e.json",
"Pages\\97bdc47834844e0d8f3a5aef747785e.rd"
]
},
{
"ModuleName": "PCPage/项目版本配置",
@@ -612,7 +624,17 @@
},
{
"ModuleName": "PCPage/任务版本详情",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-18T10:41:26.7568833+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.json",
"Pages\\项目\\项目首页\\项目首页-容器页面\\任务版本详情.rd"
]
},
{
"ModuleName": "PCPage/项目周报列表",
@@ -716,7 +738,17 @@
},
{
"ModuleName": "PCPage/任务-任务信息",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-18T10:41:26.7574+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\任务\\任务-任务信息.json",
"Pages\\任务\\任务-任务信息.rd"
]
},
{
"ModuleName": "PCPage/任务-关联资源",
@@ -744,7 +776,17 @@
},
{
"ModuleName": "PCPage/新增任务",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-18T10:41:26.7571218+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\任务\\新增任务.json",
"Pages\\任务\\新增任务.rd"
]
},
{
"ModuleName": "PCPage/新增进展",