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 604b131435 - Show all commits

28
.collaboration
View File

@@ -608,7 +608,17 @@
}, },
{ {
"ModuleName": "PCPage/项目反馈", "ModuleName": "PCPage/项目反馈",
"ModuleType": 1 "State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T17:29:18.300054+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json",
"Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd"
]
}, },
{ {
"ModuleName": "PCPage/项目版本管理", "ModuleName": "PCPage/项目版本管理",
@@ -677,7 +687,7 @@
"UserName": "超哥", "UserName": "超哥",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-06-15T17:15:10.14604+08:00", "LockDateTime": "2024-06-15T17:29:18.2998901+08:00",
"ModuleType": 1, "ModuleType": 1,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Pages\\项目\\项目反馈\\反馈与建议.json", "Pages\\项目\\项目反馈\\反馈与建议.json",
@@ -686,7 +696,19 @@
}, },
{ {
"ModuleName": "PCPage/工单进度查询", "ModuleName": "PCPage/工单进度查询",
"ModuleType": 1 "State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T17:29:18.3002557+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\项目\\项目反馈\\工单进度查询.json",
"Pages\\项目\\项目反馈\\工单进度查询.rd",
"Pages\\da845ef0f1cf4586a29964e862551d7.json",
"Pages\\da845ef0f1cf4586a29964e862551d7.rd"
]
}, },
{ {
"ModuleName": "PCPage/处理反馈工单", "ModuleName": "PCPage/处理反馈工单",