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

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

View File

@@ -822,7 +822,17 @@
},
{
"ModuleName": "PCPage/汇报管理",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T14:14:00.6609463+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\汇报管理.json",
"Pages\\汇报\\汇报管理.rd"
]
},
{
"ModuleName": "Pages/汇报/项目周报",
@@ -838,7 +848,17 @@
},
{
"ModuleName": "PCPage/日报首页",
"ModuleType": 1
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T14:14:00.6604429+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\日报\\日报首页.json",
"Pages\\汇报\\日报\\日报首页.rd"
]
},
{
"ModuleName": "PCPage/汇报详情",
@@ -1791,5 +1811,15 @@
{
"ModuleName": "ServerCommand/修改工作日报",
"ModuleType": 15
},
{
"ModuleName": "PCPage/个人日报列表",
"State": 3,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T14:14:00.6604737+08:00",
"ModuleType": 1
}
]