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

24
.collaboration
View File

@@ -834,7 +834,7 @@
"UserName": "cuckooent", "UserName": "cuckooent",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2025-08-20T14:37:59.5633756+08:00", "LockDateTime": "2025-08-20T14:54:33.8004744+08:00",
"ModuleType": 1, "ModuleType": 1,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json", "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json",
@@ -1965,7 +1965,16 @@
}, },
{ {
"ModuleName": "ServerCommand/修改工时", "ModuleName": "ServerCommand/修改工时",
"ModuleType": 15 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2025-08-20T14:54:33.8005325+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\工时\\修改工时.json"
]
}, },
{ {
"ModuleName": "ServerCommand/删除任务成员所有工时", "ModuleName": "ServerCommand/删除任务成员所有工时",
@@ -1973,7 +1982,16 @@
}, },
{ {
"ModuleName": "ServerCommand/上报实际工时", "ModuleName": "ServerCommand/上报实际工时",
"ModuleType": 15 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2025-08-20T14:54:33.800086+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\工时\\上报实际工时.json"
]
}, },
{ {
"ModuleName": "ServerCommands/TODO", "ModuleName": "ServerCommands/TODO",