WIP: 将最新版本合并至Master #1

Draft
admin wants to merge 3623 commits from 版本10 into master
Showing only changes of commit ed13540633 - Show all commits

View File

@@ -2464,7 +2464,17 @@
}, },
{ {
"ModuleName": "PCPage/项目工时统计", "ModuleName": "PCPage/项目工时统计",
"ModuleType": 1 "State": 2,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-10-16T17:18:03.9080554+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\统计\\项目工时统计.json",
"Pages\\统计\\项目工时统计.rd"
]
}, },
{ {
"ModuleName": "PCPage/统计首页", "ModuleName": "PCPage/统计首页",
@@ -2491,5 +2501,15 @@
{ {
"ModuleName": "ServerCommand/将反馈转为任务", "ModuleName": "ServerCommand/将反馈转为任务",
"ModuleType": 15 "ModuleType": 15
},
{
"ModuleName": "PCPage/项目工时统计(backup)",
"State": 3,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-10-16T17:18:03.9080827+08:00",
"ModuleType": 1
} }
] ]