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

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

View File

@@ -1624,11 +1624,30 @@
},
{
"ModuleName": "PCPage/模板详情",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "TYFEIKELE\\tyfeikele",
"Email": "example@example.com"
},
"LockDateTime": "2024-06-14T10:49:43.0888597+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\汇报模板\\模板详情.json",
"Pages\\汇报\\汇报模板\\模板详情.rd"
]
},
{
"ModuleName": "ServerCommand/根据汇报模板生成内容",
"ModuleType": 15
"State": 1,
"LockedBy": {
"UserName": "TYFEIKELE\\tyfeikele",
"Email": "example@example.com"
},
"LockDateTime": "2024-06-14T10:49:43.0886417+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\汇报\\根据汇报模板生成内容.json"
]
},
{
"ModuleName": "PCPage/日报详情",
@@ -1648,7 +1667,16 @@
},
{
"ModuleName": "ServerCommandPrivate/单日自动生成工作日报",
"ModuleType": 27
"State": 1,
"LockedBy": {
"UserName": "TYFEIKELE\\tyfeikele",
"Email": "example@example.com"
},
"LockDateTime": "2024-06-14T10:49:43.0889176+08:00",
"ModuleType": 27,
"ToRemoveFiles": [
"ServerCommands\\汇报\\单日自动生成工作日报.json"
]
},
{
"ModuleName": "ServerCommands/Gitee",