Merge remote-tracking branch 'origin/2.0' into 2.0

zhibing.pu

2024-06-21 a5c2c7e633e0dba4b80c8a15fd34c38ae097befc

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java

@@ -45,6 +45,11 @@
     */
    private String phone;
    /**
     * 手机号运营商
     */
    @TableField("phoneOperator")
    private String phoneOperator;
    /**
     * 昵称
     */
    private String nickName;
@@ -153,6 +158,11 @@
     */
    @TableField("uid")
    private Integer uid;
    /**
     * 语言类型（1=简体中文，2=英语，3=法语）
     */
    @TableField("language")
    private Integer language;


    public Integer getId() {
@@ -193,6 +203,14 @@

    public void setPhone(String phone) {
        this.phone = phone;
    }

    public String getPhoneOperator() {
        return phoneOperator;
    }

    public void setPhoneOperator(String phoneOperator) {
        this.phoneOperator = phoneOperator;
    }

    public String getNickName() {
@@ -402,7 +420,15 @@
    public void setUid(Integer uid) {
        this.uid = uid;
    }

    
    public Integer getLanguage() {
        return language;
    }
    
    public void setLanguage(Integer language) {
        this.language = language;
    }
    
    @Override
    protected Serializable pkVal() {
        return this.id;