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

13
.collaboration
View File

@@ -92,7 +92,16 @@
}, },
{ {
"ModuleName": "Table/任务进展", "ModuleName": "Table/任务进展",
"ModuleType": 7 "State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-07-04T11:06:28.5326464+08:00",
"ModuleType": 7,
"ToRemoveFiles": [
"Tables\\任务\\任务进展.json"
]
}, },
{ {
"ModuleName": "TableView/子任务视图", "ModuleName": "TableView/子任务视图",
@@ -767,7 +776,7 @@
"UserName": "超哥", "UserName": "超哥",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-07-04T11:05:57.9793311+08:00", "LockDateTime": "2024-07-04T11:06:28.5328188+08:00",
"ModuleType": 1, "ModuleType": 1,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\新增进展.json", "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\新增进展.json",