From 88b0f7ea048e9b201af0bc390f3da8840b11c899 Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtSimpleMemberVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtSimpleMemberVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtSimpleMemberVo.java
index 1b998d0..40b8073 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtSimpleMemberVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtSimpleMemberVo.java
@@ -20,7 +20,7 @@
     private String nickName;
 
     @ApiModelProperty(value = "用户姓名")
-    private String userName;
+    private String realName;
 
     @ApiModelProperty(value = "用户电话")
     private String userMobile;

--
Gitblit v1.7.1