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

44323

2024-05-17 e2d01b2009c30173ff8e9f77d5c065f4d38fa49d

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

@@ -143,6 +143,11 @@
     */
    @TableField("state")
    private Integer state;
    /**
     * 当前语言
     */
    @TableField("language")
    private Integer language;

    private BigDecimal freeMoney;

@@ -361,6 +366,14 @@
        this.appletsOpenId = appletsOpenId;
    }

    public Integer getLanguage() {
        return language;
    }

    public void setLanguage(Integer language) {
        this.language = language;
    }

    @Override
    public String toString() {
        return "UserInfo{" +