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

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

View File

@@ -814,7 +814,17 @@
},
{
"ModuleName": "PCPage/汇报管理",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-24T21:07:53.3324128+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\汇报管理.json",
"Pages\\汇报\\汇报管理.rd"
]
},
{
"ModuleName": "Pages/汇报/项目周报",
@@ -1542,7 +1552,17 @@
},
{
"ModuleName": "PCPage/日报详情",
"ModuleType": 1
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-24T21:07:53.3321458+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\个人日报\\日报详情.json",
"Pages\\汇报\\个人日报\\日报详情.rd"
]
},
{
"ModuleName": "ServerCommandPrivate/单日自动生成工作日报",
@@ -1714,7 +1734,19 @@
},
{
"ModuleName": "PCPage/个人日报列表",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-24T21:07:53.3322378+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\个人日报\\个人日报列表.json",
"Pages\\汇报\\个人日报\\个人日报列表.rd",
"Pages\\3609617039444daea57da1978344c4f.json",
"Pages\\3609617039444daea57da1978344c4f.rd"
]
},
{
"ModuleName": "Image/禁止查看.svg",
@@ -2167,5 +2199,15 @@
{
"ModuleName": "PCPage/汇报详情(汇报)",
"ModuleType": 1
},
{
"ModuleName": "PCPage/汇报详情",
"State": 3,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-24T21:07:53.3324226+08:00",
"ModuleType": 1
}
]