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

75
.collaboration
View File

@@ -640,11 +640,33 @@
},
{
"ModuleName": "PCPage/项目周报列表",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-26T16:33:19.9691493+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\项目\\项目首页\\项目首页-容器页面\\项目周报列表.json",
"Pages\\项目\\项目首页\\项目首页-容器页面\\项目周报列表.rd"
]
},
{
"ModuleName": "PCPage/项目周报首页",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-26T16:33:19.9694612+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\项目\\项目首页\\项目首页-容器页面\\项目周报首页.json",
"Pages\\项目\\项目首页\\项目首页-容器页面\\项目周报首页.rd",
"Pages\\50f88f59718b4ba78fa3fc76286d95b.json",
"Pages\\50f88f59718b4ba78fa3fc76286d95b.rd"
]
},
{
"ModuleName": "PCPage/项目仓库",
@@ -846,15 +868,44 @@
},
{
"ModuleName": "PCPage/汇报管理",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-26T16:33:19.9690302+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\汇报管理.json",
"Pages\\汇报\\汇报管理.rd"
]
},
{
"ModuleName": "Pages/汇报/项目周报",
"ModuleType": 6
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-26T16:33:19.9685102+08:00",
"ModuleType": 6,
"ToRemoveFiles": [
"Pages\\汇报\\项目周报"
]
},
{
"ModuleName": "PCPage/项目周报详情",
"ModuleType": 1
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-26T16:33:19.9688098+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\项目周报\\项目周报详情.json",
"Pages\\汇报\\项目周报\\项目周报详情.rd"
]
},
{
"ModuleName": "PCPage/汇报详情预览",
@@ -2258,7 +2309,19 @@
},
{
"ModuleName": "PCPage/任务管理",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-26T16:33:19.9693699+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\任务\\任务管理.json",
"Pages\\任务\\任务管理.rd",
"Pages\\f5fc8d78af50450e9ecd5e29f22c67b.json",
"Pages\\f5fc8d78af50450e9ecd5e29f22c67b.rd"
]
},
{
"ModuleName": "Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务审批",