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

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

View File

@@ -1140,7 +1140,20 @@
}, },
{ {
"ModuleName": "Theme", "ModuleName": "Theme",
"ModuleType": 9 "State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-25T14:07:45.7440926+08:00",
"ModuleType": 9,
"ToRemoveFiles": [
"Theme\\CellTypeStyles",
"Theme\\ListViewStyles",
"Theme\\StyleDefaultNames",
"Theme\\ThemeConfig",
"Reports\\DefaultTheme.rdlx-theme"
]
}, },
{ {
"ModuleName": "image/内置图片", "ModuleName": "image/内置图片",
@@ -2248,7 +2261,7 @@
"UserName": "超哥", "UserName": "超哥",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-06-25T13:20:17.8997327+08:00", "LockDateTime": "2024-06-25T14:07:45.7444477+08:00",
"ModuleType": 1 "ModuleType": 1
}, },
{ {