Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java

@@ -72,10 +72,15 @@
    @TableField("isAuth")
    private Integer isAuth;
    /**
     * 真实姓名
     * 姓氏
     */
    @TableField("name")
    private String name;
    @TableField("lastName")
    private String lastName;
    /**
     * 名字
     */
    @TableField("firstName")
    private String firstName;
    /**
     * 身份证号码
     */
@@ -267,12 +272,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() {
@@ -417,7 +430,6 @@
                ", emergencyContact='" + emergencyContact + '\'' +
                ", emergencyContactNumber='" + emergencyContactNumber + '\'' +
                ", isAuth=" + isAuth +
                ", name='" + name + '\'' +
                ", idCard='" + idCard + '\'' +
                ", idCardFront='" + idCardFront + '\'' +
                ", idCardReverse='" + idCardReverse + '\'' +