Merge branch 'dev' of https://gitee.com/xlsea/ruoyi-plus-soybean into flow

2025-09-24 07:49:47 +08:00 · 2025-06-26 17:14:41 +08:00
parent 80faf4b47c 3628c2496a
commit 188533adc9
48 changed files with 1398 additions and 2075 deletions
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@ -166,7 +166,8 @@ const local: App.I18n.Schema = {
    },
    watermark: {
      visible: 'Watermark Full Screen Visible',
-      text: 'Watermark Text'
+      text: 'Watermark Text',
+      enableUserName: 'Enable User Name Watermark'
    },
    tablePropsTitle: 'Table Props',
    table: {