Merge remote-tracking branch 'origin/master'

liujie

8 天以前 7342170db7dc39326698d39b74e1858502fd574a

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

@@ -133,6 +133,41 @@
    @TableField("state")
    private Integer state;



    /**
     * 绑定的司机id
     */
    @TableField("bindDriverId")
    private Integer bindDriverId;

    /**
     * 绑定司机有效期
     */

    private Date bindExpireDate;
    /**
     * 中台用户ID
     */
    @TableField("onconUUID")
    private String onconUUID;

    public Integer getBindDriverId() {
        return bindDriverId;
    }

    public void setBindDriverId(Integer bindDriverId) {
        this.bindDriverId = bindDriverId;
    }

    public Date getBindExpireDate() {
        return bindExpireDate;
    }

    public void setBindExpireDate(Date bindExpireDate) {
        this.bindExpireDate = bindExpireDate;
    }

    public String getRegistIp() {
        return registIp;
    }
@@ -324,7 +359,15 @@
    public void setAppletsOpenId(String appletsOpenId) {
        this.appletsOpenId = appletsOpenId;
    }

    
    public String getOnconUUID() {
        return onconUUID;
    }
    
    public void setOnconUUID(String onconUUID) {
        this.onconUUID = onconUUID;
    }
    
    @Override
    public String toString() {
        return "UserInfo{" +