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

Draft
admin wants to merge 3623 commits from 版本10 into master
5 changed files with 9 additions and 51 deletions
Showing only changes of commit bf256c0ec6 - Show all commits

View File

@@ -2270,19 +2270,7 @@
}, },
{ {
"ModuleName": "PCPage/工作台首页", "ModuleName": "PCPage/工作台首页",
"State": 1, "ModuleType": 1
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-11-05T15:41:14.1793883+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\工作台\\工作台首页.json",
"Pages\\工作台\\工作台首页.rd",
"Pages\\3868fc7f40b841649f14b5adba61954.json",
"Pages\\3868fc7f40b841649f14b5adba61954.rd"
]
}, },
{ {
"ModuleName": "PCPage/项目负荷 (2)", "ModuleName": "PCPage/项目负荷 (2)",
@@ -2482,45 +2470,15 @@
}, },
{ {
"ModuleName": "RdlReport/人员工时报表", "ModuleName": "RdlReport/人员工时报表",
"State": 1, "ModuleType": 18
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-11-05T15:48:44.0898019+08:00",
"ModuleType": 18,
"ToRemoveFiles": [
"Reports\\人员工时报表.json",
"Reports\\人员工时报表.rdlx"
]
}, },
{ {
"ModuleName": "RdlReport/客户工时报表", "ModuleName": "RdlReport/客户工时报表",
"State": 1, "ModuleType": 18
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-11-05T15:41:30.5558294+08:00",
"ModuleType": 18,
"ToRemoveFiles": [
"Reports\\客户工时报表.json",
"Reports\\客户工时报表.rdlx"
]
}, },
{ {
"ModuleName": "RdlReport/项目工时报表", "ModuleName": "RdlReport/项目工时报表",
"State": 1, "ModuleType": 18
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-11-05T15:50:11.624925+08:00",
"ModuleType": 18,
"ToRemoveFiles": [
"Reports\\项目工时报表.json",
"Reports\\项目工时报表.rdlx"
]
}, },
{ {
"ModuleName": "ServerCommand/复活流程", "ModuleName": "ServerCommand/复活流程",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long