mirror of
https://github.com/m-xlsea/ruoyi-plus-soybean.git
synced 2025-09-24 07:49:47 +08:00
Merge remote-tracking branch 'soybean/main' into dev
# Conflicts: # CHANGELOG.md # README.en_US.md # README.md # package.json # pnpm-lock.yaml # src/App.vue # src/theme/settings.ts # src/views/_builtin/iframe-page/[url].vue
This commit is contained in:
@ -58,7 +58,8 @@ export const themeSettings: App.Theme.ThemeSetting = {
|
||||
},
|
||||
watermark: {
|
||||
visible: import.meta.env.VITE_WATERMARK === 'Y',
|
||||
text: 'RuoYi-Vue-Plus'
|
||||
text: 'RuoYi-Vue-Plus',
|
||||
enableUserName: false
|
||||
},
|
||||
table: {
|
||||
bordered: true,
|
||||
|
Reference in New Issue
Block a user