From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java | 117 ++++++++++++++++++++--------------------------------------
1 files changed, 40 insertions(+), 77 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
index c359ba6..43af822 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
+++ b/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=女)
*/
@@ -268,6 +282,9 @@
* 余额
*/
private BigDecimal balance;
+// private BigDecimal commission;
+// private BigDecimal backgroundBalance;
+// private BigDecimal couponBalance;
/**
* 活动总收入
@@ -421,6 +438,14 @@
this.phone = phone;
}
+ public String getPhoneOperator() {
+ return phoneOperator;
+ }
+
+ public void setPhoneOperator(String phoneOperator) {
+ this.phoneOperator = phoneOperator;
+ }
+
public String getPassword() {
return password;
}
@@ -429,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() {
@@ -906,75 +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 + '\'' +
- ", 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 +
- '}';
- }
+
}
--
Gitblit v1.7.1