From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java
index 7b0cc50..4a8da48 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java
@@ -65,6 +65,19 @@
      */
     private String emergencyContact;
     /**
+     * 邮箱
+     */
+    private String email;
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    /**
      * 紧急联系电话
      */
     private String emergencyContactNumber;
@@ -73,9 +86,13 @@
      */
     private Integer isAuth;
     /**
-     * 真实姓名
+     * 姓氏
      */
-    private String name;
+    private String lastName;
+    /**
+     * 名字
+     */
+    private String firstName;
     /**
      * 身份证号
      */
@@ -234,12 +251,20 @@
         this.isAuth = isAuth;
     }
 
-    public String getName() {
-        return name;
+    public String getLastName() {
+        return lastName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
     }
 
     public String getIdCard() {
@@ -398,7 +423,6 @@
                 ", emergencyContact='" + emergencyContact + '\'' +
                 ", emergencyContactNumber='" + emergencyContactNumber + '\'' +
                 ", isAuth=" + isAuth +
-                ", name='" + name + '\'' +
                 ", idCard='" + idCard + '\'' +
                 ", idCardFront='" + idCardFront + '\'' +
                 ", idCardReverse='" + idCardReverse + '\'' +

--
Gitblit v1.7.1