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/TDriver.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
@@ -19,6 +20,7 @@
 * @since 2020-06-04
 */
@TableName("t_driver")
@Data
public class TDriver extends Model<TDriver> {

    private static final long serialVersionUID = 1L;
@@ -34,6 +36,11 @@
     */
    private String jobNumber;
    /**
     * 手机号运营商
     */
    @TableField("phoneOperator")
    private String phoneOperator;
    /**
     * 手机号
     */
    private String phone;
@@ -41,10 +48,17 @@
     * 密码
     */
    private String password;



    /**
     * 姓名
     * 姓
     */
    private String name;
    private String lastName;
    /**
     * 名
     */
    private String firstName;
    /**
     * 性别(1=男，2=女)
     */
@@ -85,6 +99,10 @@
     * 生日
     */
    private Date birthday;
    /**
     * 邮件
     */
    private String email;
    /**
     * 银行卡号
     */
@@ -132,7 +150,11 @@
    /**
     * 驾驶证照片
     */
    private String driveCardImgUrl;
    private String driveCardImgUrl1;
    /**
     * 驾驶证照片
     */
    private String driveCardImgUrl2;
    /**
     * 准驾车型
     */
@@ -260,6 +282,9 @@
     * 余额
     */
    private BigDecimal balance;
//    private BigDecimal commission;
//    private BigDecimal backgroundBalance;
//    private BigDecimal couponBalance;

    /**
     * 活动总收入
@@ -413,6 +438,14 @@
        this.phone = phone;
    }

    public String getPhoneOperator() {
        return phoneOperator;
    }

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

    public String getPassword() {
        return password;
    }
@@ -421,12 +454,20 @@
        this.password = password;
    }

    public String getName() {
        return name;
    public String getLastName() {
        return lastName;
    }

    public void setName(String name) {
        this.name = name;
    public void setLastName(String lastName) {
        this.lastName = lastName;
    }

    public String getFirstName() {
        return firstName;
    }

    public void setFirstName(String firstName) {
        this.firstName = firstName;
    }

    public Integer getSex() {
@@ -499,6 +540,14 @@

    public void setBirthday(Date birthday) {
        this.birthday = birthday;
    }

    public String getEmail() {
        return email;
    }

    public void setEmail(String email) {
        this.email = email;
    }

    public String getBankCardNumber() {
@@ -589,12 +638,20 @@
        this.driveCard = driveCard;
    }

    public String getDriveCardImgUrl() {
        return driveCardImgUrl;
    public String getDriveCardImgUrl1() {
        return driveCardImgUrl1;
    }

    public void setDriveCardImgUrl(String driveCardImgUrl) {
        this.driveCardImgUrl = driveCardImgUrl;
    public void setDriveCardImgUrl1(String driveCardImgUrl1) {
        this.driveCardImgUrl1 = driveCardImgUrl1;
    }

    public String getDriveCardImgUrl2() {
        return driveCardImgUrl2;
    }

    public void setDriveCardImgUrl2(String driveCardImgUrl2) {
        this.driveCardImgUrl2 = driveCardImgUrl2;
    }

    public String getDriverType() {
@@ -882,76 +939,5 @@
        return this.id;
    }

    @Override
    public String toString() {
        return "TDriver{" +
                "id=" + id +
                ", account='" + account + '\'' +
                ", jobNumber='" + jobNumber + '\'' +
                ", phone='" + phone + '\'' +
                ", password='" + password + '\'' +
                ", name='" + name + '\'' +
                ", sex=" + sex +
                ", idCard='" + idCard + '\'' +
                ", companyId=" + companyId +
                ", franchiseeId=" + franchiseeId +
                ", headImgUrl='" + headImgUrl + '\'' +
                ", faceImgUrl='" + faceImgUrl + '\'' +
                ", idCardImgUrl1='" + idCardImgUrl1 + '\'' +
                ", idCardImgUrl2='" + idCardImgUrl2 + '\'' +
                ", placeOfEmployment='" + placeOfEmployment + '\'' +
                ", birthday=" + birthday +
                ", bankCardNumber='" + bankCardNumber + '\'' +
                ", driverNationality='" + driverNationality + '\'' +
                ", driverNation='" + driverNation + '\'' +
                ", driverMaritalStatus=" + driverMaritalStatus +
                ", driverLanguageLevel='" + driverLanguageLevel + '\'' +
                ", driverEducation='" + driverEducation + '\'' +
                ", driverCensus='" + driverCensus + '\'' +
                ", driverAddress='" + driverAddress + '\'' +
                ", driverContactAddress='" + driverContactAddress + '\'' +
                ", driverAge=" + driverAge +
                ", driveCard='" + driveCard + '\'' +
                ", driveCardImgUrl='" + driveCardImgUrl + '\'' +
                ", driverType='" + driverType + '\'' +
                ", getDriverLicenseDate=" + getDriverLicenseDate +
                ", driverLicenseOn=" + driverLicenseOn +
                ", driverLicenseOff=" + driverLicenseOff +
                ", taxiDriver=" + taxiDriver +
                ", taxiAptitudeCard='" + taxiAptitudeCard + '\'' +
                ", networkCarlssueImg='" + networkCarlssueImg + '\'' +
                ", networkCarlssueOrganization='" + networkCarlssueOrganization + '\'' +
                ", networkCarlssueDate=" + networkCarlssueDate +
                ", getNetworkCarProofDate=" + getNetworkCarProofDate +
                ", networkCarProofOn=" + networkCarProofOn +
                ", networkCarProofOff=" + networkCarProofOff +
                ", registerDate=" + registerDate +
                ", fullTimeDriver=" + fullTimeDriver +
                ", inDriverBlacklist=" + inDriverBlacklist +
                ", commercialType=" + commercialType +
                ", contractCompany='" + contractCompany + '\'' +
                ", contractOn=" + contractOn +
                ", contractOff=" + contractOff +
                ", emergencyContact='" + emergencyContact + '\'' +
                ", emergencyContactPhone='" + emergencyContactPhone + '\'' +
                ", emergencyContactAddress='" + emergencyContactAddress + '\'' +
                ", remark='" + remark + '\'' +
                ", isPlatCar=" + isPlatCar +
                ", carId=" + carId +
                ", authState=" + authState +
                ", state=" + state +
                ", flag='" + flag + '\'' +
                ", insertTime=" + insertTime +
                ", insertUser=" + insertUser +
                ", updateTime=" + updateTime +
                ", updateUser=" + updateUser +
                ", addType=" + addType +
                ", balance=" + balance +
                ", businessMoney=" + businessMoney +
                ", laveBusinessMoney=" + laveBusinessMoney +
                ", addObjectId=" + addObjectId +
                ", uid=" + uid +
                ", teamId=" + teamId +
                '}';
    }

}