From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtSysStaffImportDto.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtSysStaffImportDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtSysStaffImportDto.java
index f6ff933..9580989 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtSysStaffImportDto.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtSysStaffImportDto.java
@@ -16,10 +16,10 @@
     @Excel(name = "姓名")
     private String staffName;
 
-    @Excel(name = "账号")
+    @Excel(name = "帐号")
     private String userName;
 
-    @Excel(name = "昵称")
+    @Excel(name = "别名")
     private String nickName;
 
     @Excel(name = "职务")
@@ -37,6 +37,15 @@
     @Excel(name = "座机")
     private String phone;
 
-    @Excel(name = "邮箱")
+    @Excel(name = "个人邮箱")
     private String email;
+
+    @Excel(name = "地址")
+    private String address;
+
+    @Excel(name = "视频号")
+    private String videoNumber;
+
+    @Excel(name = "禁用状态")
+    private String userStatus;
 }

--
Gitblit v1.7.1