Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel i...

44323

2024-06-04 c4650572e6dc6c6efb6e1c61c11dcae0706105c7

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

@@ -158,6 +158,11 @@
     */
    @TableField("uid")
    private Integer uid;
    /**
     * 语言类型（1=简体中文，2=英语，3=法语）
     */
    @TableField("language")
    private Integer language;


    public Integer getId() {
@@ -416,6 +421,14 @@
        this.uid = uid;
    }

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