chore: merge

2026-03-24 14:14:31 +08:00 · 2025-10-09 20:53:21 +08:00
parent c12a6e4bdd 2ce161e585
commit 80328e7565
29 changed files with 165 additions and 100 deletions
--- a/packages/@core/preferences/src/config.ts
+++ b/packages/@core/preferences/src/config.ts
@@ -29,6 +29,7 @@ const defaultPreferences: Preferences = {
    name: 'Vben Admin',
    preferencesButtonPosition: 'auto',
    watermark: false,
+    watermarkContent: '',
    zIndex: 200,
  },
  breadcrumb: {
--- a/packages/@core/preferences/src/types.ts
+++ b/packages/@core/preferences/src/types.ts
@@ -75,6 +75,10 @@ interface AppPreferences {
   * @zh_CN 是否开启水印
   */
  watermark: boolean;
+  /**
+   * @zh_CN 水印文案
+   */
+  watermarkContent: string;
  /** z-index */
  zIndex: number;
 }