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

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

View File

@@ -840,11 +840,31 @@
},
{
"ModuleName": "PCPage/导入汇报数据",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-24T21:12:48.8673442+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\个人日报\\导入汇报数据.json",
"Pages\\汇报\\个人日报\\导入汇报数据.rd"
]
},
{
"ModuleName": "PCPage/日报助手",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-24T21:12:48.8672728+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\个人日报\\日报助手.json",
"Pages\\汇报\\个人日报\\日报助手.rd"
]
},
{
"ModuleName": "Pages/工时",
@@ -2220,7 +2240,19 @@
},
{
"ModuleName": "PCPage/汇报详情(汇报)",
"ModuleType": 1
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-24T21:12:48.8671977+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\个人日报\\汇报详情(汇报).json",
"Pages\\汇报\\个人日报\\汇报详情(汇报).rd",
"Pages\\484d3ed119274a60bf32f15d178cf60.json",
"Pages\\484d3ed119274a60bf32f15d178cf60.rd"
]
},
{
"ModuleName": "PCPage/汇报详情",
@@ -2241,5 +2273,15 @@
},
"LockDateTime": "2024-06-24T21:12:35.1699257+08:00",
"ModuleType": 1
},
{
"ModuleName": "PCPage/汇报详情(废弃)",
"State": 3,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-24T21:12:48.8672073+08:00",
"ModuleType": 1
}
]