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

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

View File

@@ -602,7 +602,20 @@
}, },
{ {
"ModuleName": "Theme", "ModuleName": "Theme",
"ModuleType": 9 "State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-28T08:45:51.4127627+08:00",
"ModuleType": 9,
"ToRemoveFiles": [
"Theme\\CellTypeStyles",
"Theme\\ListViewStyles",
"Theme\\StyleDefaultNames",
"Theme\\ThemeConfig",
"Reports\\DefaultTheme.rdlx-theme"
]
}, },
{ {
"ModuleName": "image/内置图片", "ModuleName": "image/内置图片",
@@ -1200,7 +1213,7 @@
"UserName": "SHAMUSPC\\NINGMEI", "UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-03-28T08:33:12.5692592+08:00", "LockDateTime": "2024-03-28T08:45:51.41296+08:00",
"ModuleType": 1, "ModuleType": 1,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Pages\\汇报\\导入汇报数据.json", "Pages\\汇报\\导入汇报数据.json",