Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

2025-03-31 15:20:14 +08:00
parent ebc571e13f d6f239c564
commit 0a19ec3122
21 changed files with 298 additions and 45 deletions
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -116,7 +116,7 @@ watch(
  async (enable) => {
    if (enable) {
      await updateWatermark({
-        content: `${userStore.userInfo?.username}`,
+        content: `${userStore.userInfo?.username} - ${userStore.userInfo?.realName}`,
      });
    } else {
      destroyWatermark();