From 536ef422b4f3d8bd0179fa664444a467913616c1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 24 七月 2025 09:05:50 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java |  807 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 422 insertions(+), 385 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java
index 78249f9..50711b0 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java
@@ -1,12 +1,13 @@
 package com.stylefeng.guns.modular.system.model;
 
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>
@@ -18,385 +19,421 @@
  */
 @TableName("t_user")
 public class TUser extends Model<TUser> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-    /**
-     * 企业id
-     */
-    private Integer companyId;
-    /**
-     * 注册ip
-     */
-    private String registIp;
-    /**
-     * 注册地区县code
-     */
-    private String registAreaCode;
-    /**
-     * 手机号
-     */
-    private String phone;
-    /**
-     * 昵称
-     */
-    private String nickName;
-    /**
-     * 头像
-     */
-    private String avatar;
-    /**
-     * 生日
-     */
-    private Date birthday;
-    /**
-     * 性别(1:男,2:女)
-     */
-    private Integer sex;
-    /**
-     * 紧急联系人
-     */
-    private String emergencyContact;
-    /**
-     * 紧急联系电话
-     */
-    private String emergencyContactNumber;
-    /**
-     * 是否实名认证(1=否,2=是)
-     */
-    private Integer isAuth;
-    /**
-     * 真实姓名
-     */
-    private String name;
-    /**
-     * 身份证号
-     */
-    private String idCard;
-    /**
-     * 身份证正面
-     */
-    private String idCardFront;
-    /**
-     * 身份证反面
-     */
-    private String idCardReverse;
-    /**
-     * 历史消费
-     */
-    private BigDecimal consumption;
-    /**
-     * 余额
-     */
-    private BigDecimal balance;
-    /**
-     * 积分
-     */
-    private Integer integral;
-    /**
-     * 密码
-     */
-    private String passWord;
-    /**
-     * 微信openid
-     */
-    private String openId;
-    /**
-     * 微信unionid
-     */
-    private String unionid;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 1=正常,2=冻结
-     */
-    private Integer state;
-    /**
-     * 1:创建,2:修改,3:删除
-     */
-    private String flag;
-    private Date insertTime;
-    private Integer insertUser;
-    private Date updateTime;
-    private Integer updateUser;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Integer companyId) {
-        this.companyId = companyId;
-    }
-
-    public String getRegistIp() {
-        return registIp;
-    }
-
-    public void setRegistIp(String registIp) {
-        this.registIp = registIp;
-    }
-
-    public String getRegistAreaCode() {
-        return registAreaCode;
-    }
-
-    public void setRegistAreaCode(String registAreaCode) {
-        this.registAreaCode = registAreaCode;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public Date getBirthday() {
-        return birthday;
-    }
-
-    public void setBirthday(Date birthday) {
-        this.birthday = birthday;
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public String getEmergencyContact() {
-        return emergencyContact;
-    }
-
-    public void setEmergencyContact(String emergencyContact) {
-        this.emergencyContact = emergencyContact;
-    }
-
-    public String getEmergencyContactNumber() {
-        return emergencyContactNumber;
-    }
-
-    public void setEmergencyContactNumber(String emergencyContactNumber) {
-        this.emergencyContactNumber = emergencyContactNumber;
-    }
-
-    public Integer getIsAuth() {
-        return isAuth;
-    }
-
-    public void setIsAuth(Integer isAuth) {
-        this.isAuth = isAuth;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getIdCard() {
-        return idCard;
-    }
-
-    public void setIdCard(String idCard) {
-        this.idCard = idCard;
-    }
-
-    public String getIdCardFront() {
-        return idCardFront;
-    }
-
-    public void setIdCardFront(String idCardFront) {
-        this.idCardFront = idCardFront;
-    }
-
-    public String getIdCardReverse() {
-        return idCardReverse;
-    }
-
-    public void setIdCardReverse(String idCardReverse) {
-        this.idCardReverse = idCardReverse;
-    }
-
-    public BigDecimal getConsumption() {
-        return consumption;
-    }
-
-    public void setConsumption(BigDecimal consumption) {
-        this.consumption = consumption;
-    }
-
-    public BigDecimal getBalance() {
-        return balance;
-    }
-
-    public void setBalance(BigDecimal balance) {
-        this.balance = balance;
-    }
-
-    public Integer getIntegral() {
-        return integral;
-    }
-
-    public void setIntegral(Integer integral) {
-        this.integral = integral;
-    }
-
-    public String getPassWord() {
-        return passWord;
-    }
-
-    public void setPassWord(String passWord) {
-        this.passWord = passWord;
-    }
-
-    public String getOpenId() {
-        return openId;
-    }
-
-    public void setOpenId(String openId) {
-        this.openId = openId;
-    }
-
-    public String getUnionid() {
-        return unionid;
-    }
-
-    public void setUnionid(String unionid) {
-        this.unionid = unionid;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getFlag() {
-        return flag;
-    }
-
-    public void setFlag(String flag) {
-        this.flag = flag;
-    }
-
-    public Date getInsertTime() {
-        return insertTime;
-    }
-
-    public void setInsertTime(Date insertTime) {
-        this.insertTime = insertTime;
-    }
-
-    public Integer getInsertUser() {
-        return insertUser;
-    }
-
-    public void setInsertUser(Integer insertUser) {
-        this.insertUser = insertUser;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setUpdateUser(Integer updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "TUser{" +
-        "id=" + id +
-        ", companyId=" + companyId +
-        ", registIp=" + registIp +
-        ", registAreaCode=" + registAreaCode +
-        ", phone=" + phone +
-        ", nickName=" + nickName +
-        ", avatar=" + avatar +
-        ", birthday=" + birthday +
-        ", sex=" + sex +
-        ", emergencyContact=" + emergencyContact +
-        ", emergencyContactNumber=" + emergencyContactNumber +
-        ", isAuth=" + isAuth +
-        ", name=" + name +
-        ", idCard=" + idCard +
-        ", idCardFront=" + idCardFront +
-        ", idCardReverse=" + idCardReverse +
-        ", consumption=" + consumption +
-        ", balance=" + balance +
-        ", integral=" + integral +
-        ", passWord=" + passWord +
-        ", openId=" + openId +
-        ", unionid=" + unionid +
-        ", remark=" + remark +
-        ", state=" + state +
-        ", flag=" + flag +
-        ", insertTime=" + insertTime +
-        ", insertUser=" + insertUser +
-        ", updateTime=" + updateTime +
-        ", updateUser=" + updateUser +
-        "}";
-    }
+	
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 主键id
+	 */
+	@TableId(value = "id", type = IdType.AUTO)
+	private Integer id;
+	/**
+	 * 企业id
+	 */
+	private Integer companyId;
+	/**
+	 * 注册ip
+	 */
+	private String registIp;
+	/**
+	 * 注册地区县code
+	 */
+	private String registAreaCode;
+	/**
+	 * 手机号
+	 */
+	private String phone;
+	/**
+	 * 昵称
+	 */
+	private String nickName;
+	/**
+	 * 头像
+	 */
+	private String avatar;
+	/**
+	 * 生日
+	 */
+	private Date birthday;
+	/**
+	 * 性别(1:男,2:女)
+	 */
+	private Integer sex;
+	/**
+	 * 紧急联系人
+	 */
+	private String emergencyContact;
+	/**
+	 * 紧急联系电话
+	 */
+	private String emergencyContactNumber;
+	/**
+	 * 是否实名认证(1=否,2=是)
+	 */
+	private Integer isAuth;
+	/**
+	 * 真实姓名
+	 */
+	private String name;
+	/**
+	 * 身份证号
+	 */
+	private String idCard;
+	/**
+	 * 身份证正面
+	 */
+	private String idCardFront;
+	/**
+	 * 身份证反面
+	 */
+	private String idCardReverse;
+	/**
+	 * 历史消费
+	 */
+	private BigDecimal consumption;
+	/**
+	 * 余额
+	 */
+	private BigDecimal balance;
+	/**
+	 * 积分
+	 */
+	private Integer integral;
+	/**
+	 * 密码
+	 */
+	private String passWord;
+	/**
+	 * 微信openid
+	 */
+	private String openId;
+	/**
+	 * 微信unionid
+	 */
+	private String unionid;
+	/**
+	 * 备注
+	 */
+	private String remark;
+	/**
+	 * 1=正常,2=冻结
+	 */
+	private Integer state;
+	/**
+	 * 1:创建,2:修改,3:删除
+	 */
+	private String flag;
+	private Date insertTime;
+	private Integer insertUser;
+	private Date updateTime;
+	private Integer updateUser;
+	/**
+	 * 是否为顺风车司机(0否,1是)
+	 */
+	private Integer isDriverRide;
+	/**
+	 * 顺风车司机id
+	 */
+	private Integer driverId;
+	/**
+	 * 实名认证照片
+	 */
+	private String certificationImg;
+	
+	
+	public Integer getId() {
+		return id;
+	}
+	
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	
+	public Integer getCompanyId() {
+		return companyId;
+	}
+	
+	public void setCompanyId(Integer companyId) {
+		this.companyId = companyId;
+	}
+	
+	public String getRegistIp() {
+		return registIp;
+	}
+	
+	public void setRegistIp(String registIp) {
+		this.registIp = registIp;
+	}
+	
+	public String getRegistAreaCode() {
+		return registAreaCode;
+	}
+	
+	public void setRegistAreaCode(String registAreaCode) {
+		this.registAreaCode = registAreaCode;
+	}
+	
+	public String getPhone() {
+		return phone;
+	}
+	
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+	
+	public String getNickName() {
+		return nickName;
+	}
+	
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+	
+	public String getAvatar() {
+		return avatar;
+	}
+	
+	public void setAvatar(String avatar) {
+		this.avatar = avatar;
+	}
+	
+	public Date getBirthday() {
+		return birthday;
+	}
+	
+	public void setBirthday(Date birthday) {
+		this.birthday = birthday;
+	}
+	
+	public Integer getSex() {
+		return sex;
+	}
+	
+	public void setSex(Integer sex) {
+		this.sex = sex;
+	}
+	
+	public String getEmergencyContact() {
+		return emergencyContact;
+	}
+	
+	public void setEmergencyContact(String emergencyContact) {
+		this.emergencyContact = emergencyContact;
+	}
+	
+	public String getEmergencyContactNumber() {
+		return emergencyContactNumber;
+	}
+	
+	public void setEmergencyContactNumber(String emergencyContactNumber) {
+		this.emergencyContactNumber = emergencyContactNumber;
+	}
+	
+	public Integer getIsAuth() {
+		return isAuth;
+	}
+	
+	public void setIsAuth(Integer isAuth) {
+		this.isAuth = isAuth;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public String getIdCard() {
+		return idCard;
+	}
+	
+	public void setIdCard(String idCard) {
+		this.idCard = idCard;
+	}
+	
+	public String getIdCardFront() {
+		return idCardFront;
+	}
+	
+	public void setIdCardFront(String idCardFront) {
+		this.idCardFront = idCardFront;
+	}
+	
+	public String getIdCardReverse() {
+		return idCardReverse;
+	}
+	
+	public void setIdCardReverse(String idCardReverse) {
+		this.idCardReverse = idCardReverse;
+	}
+	
+	public BigDecimal getConsumption() {
+		return consumption;
+	}
+	
+	public void setConsumption(BigDecimal consumption) {
+		this.consumption = consumption;
+	}
+	
+	public BigDecimal getBalance() {
+		return balance;
+	}
+	
+	public void setBalance(BigDecimal balance) {
+		this.balance = balance;
+	}
+	
+	public Integer getIntegral() {
+		return integral;
+	}
+	
+	public void setIntegral(Integer integral) {
+		this.integral = integral;
+	}
+	
+	public String getPassWord() {
+		return passWord;
+	}
+	
+	public void setPassWord(String passWord) {
+		this.passWord = passWord;
+	}
+	
+	public String getOpenId() {
+		return openId;
+	}
+	
+	public void setOpenId(String openId) {
+		this.openId = openId;
+	}
+	
+	public String getUnionid() {
+		return unionid;
+	}
+	
+	public void setUnionid(String unionid) {
+		this.unionid = unionid;
+	}
+	
+	public String getRemark() {
+		return remark;
+	}
+	
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	
+	public Integer getState() {
+		return state;
+	}
+	
+	public void setState(Integer state) {
+		this.state = state;
+	}
+	
+	public String getFlag() {
+		return flag;
+	}
+	
+	public void setFlag(String flag) {
+		this.flag = flag;
+	}
+	
+	public Date getInsertTime() {
+		return insertTime;
+	}
+	
+	public void setInsertTime(Date insertTime) {
+		this.insertTime = insertTime;
+	}
+	
+	public Integer getInsertUser() {
+		return insertUser;
+	}
+	
+	public void setInsertUser(Integer insertUser) {
+		this.insertUser = insertUser;
+	}
+	
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+	
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	
+	public Integer getUpdateUser() {
+		return updateUser;
+	}
+	
+	public void setUpdateUser(Integer updateUser) {
+		this.updateUser = updateUser;
+	}
+	
+	public Integer getIsDriverRide() {
+		return isDriverRide;
+	}
+	
+	public void setIsDriverRide(Integer isDriverRide) {
+		this.isDriverRide = isDriverRide;
+	}
+	
+	public Integer getDriverId() {
+		return driverId;
+	}
+	
+	public void setDriverId(Integer driverId) {
+		this.driverId = driverId;
+	}
+	
+	public String getCertificationImg() {
+		return certificationImg;
+	}
+	
+	public void setCertificationImg(String certificationImg) {
+		this.certificationImg = certificationImg;
+	}
+	
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+	
+	@Override
+	public String toString() {
+		return "TUser{" +
+				"id=" + id +
+				", companyId=" + companyId +
+				", registIp=" + registIp +
+				", registAreaCode=" + registAreaCode +
+				", phone=" + phone +
+				", nickName=" + nickName +
+				", avatar=" + avatar +
+				", birthday=" + birthday +
+				", sex=" + sex +
+				", emergencyContact=" + emergencyContact +
+				", emergencyContactNumber=" + emergencyContactNumber +
+				", isAuth=" + isAuth +
+				", name=" + name +
+				", idCard=" + idCard +
+				", idCardFront=" + idCardFront +
+				", idCardReverse=" + idCardReverse +
+				", consumption=" + consumption +
+				", balance=" + balance +
+				", integral=" + integral +
+				", passWord=" + passWord +
+				", openId=" + openId +
+				", unionid=" + unionid +
+				", remark=" + remark +
+				", state=" + state +
+				", flag=" + flag +
+				", insertTime=" + insertTime +
+				", insertUser=" + insertUser +
+				", updateTime=" + updateTime +
+				", updateUser=" + updateUser +
+				"}";
+	}
 }

--
Gitblit v1.7.1