From 997bf5ea58c2741b1862a1010bf5d60a32850c4f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 三月 2023 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java | 88 +++++++++++++++++++++-----------------------
1 files changed, 42 insertions(+), 46 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
index 049b69f..d9acd25 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
@@ -15,6 +15,8 @@
private String name;
@ApiModelProperty("性别（1=男，2=女）")
private Integer sex;
+ @ApiModelProperty("生日")
+ private Date birthday;
@ApiModelProperty("居住地")
private String driverContactAddress;
@ApiModelProperty("居住地(带分隔符)")
@@ -29,18 +31,16 @@
private Date getDriverLicenseDate;
@ApiModelProperty("服务模式（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）多个以逗号分隔")
private String type;
- @ApiModelProperty("从业地行政代码（510100）")
- private String placeOfEmployment;
- @ApiModelProperty("从业地地址（带分隔符）")
- private String placeOfPractice;
+ @ApiModelProperty("邮件")
+ private String email;
+ @ApiModelProperty("从业地城市id")
+ private Integer placeOfPracticeId;
@ApiModelProperty("头像")
private String headImgUrl;
- @ApiModelProperty("驾驶证照片")
+ @ApiModelProperty("驾驶证照片正面")
private String driveCardImgUrl;
- @ApiModelProperty("网约车资格证照片")
- private String networkCarlssueImg;
- @ApiModelProperty("出租车资格证号")
- private String taxiAptitudeCard;
+ @ApiModelProperty("驾驶证照片背面")
+ private String driveCardImgUrl2;
public String getPhone() {
@@ -83,6 +83,14 @@
this.driverContactAddress = driverContactAddress;
}
+ public String getDriverContactAddress_() {
+ return driverContactAddress_;
+ }
+
+ public void setDriverContactAddress_(String driverContactAddress_) {
+ this.driverContactAddress_ = driverContactAddress_;
+ }
+
public String getIdCard() {
return idCard;
}
@@ -123,12 +131,20 @@
this.type = type;
}
- public String getPlaceOfEmployment() {
- return placeOfEmployment;
+ public String getEmail() {
+ return email;
}
- public void setPlaceOfEmployment(String placeOfEmployment) {
- this.placeOfEmployment = placeOfEmployment;
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public Integer getPlaceOfPracticeId() {
+ return placeOfPracticeId;
+ }
+
+ public void setPlaceOfPracticeId(Integer placeOfPracticeId) {
+ this.placeOfPracticeId = placeOfPracticeId;
}
public String getHeadImgUrl() {
@@ -147,36 +163,20 @@
this.driveCardImgUrl = driveCardImgUrl;
}
- public String getNetworkCarlssueImg() {
- return networkCarlssueImg;
+ public String getDriveCardImgUrl2() {
+ return driveCardImgUrl2;
}
- public void setNetworkCarlssueImg(String networkCarlssueImg) {
- this.networkCarlssueImg = networkCarlssueImg;
+ public void setDriveCardImgUrl2(String driveCardImgUrl2) {
+ this.driveCardImgUrl2 = driveCardImgUrl2;
}
- public String getTaxiAptitudeCard() {
- return taxiAptitudeCard;
+ public Date getBirthday() {
+ return birthday;
}
- public void setTaxiAptitudeCard(String taxiAptitudeCard) {
- this.taxiAptitudeCard = taxiAptitudeCard;
- }
-
- public String getDriverContactAddress_() {
- return driverContactAddress_;
- }
-
- public void setDriverContactAddress_(String driverContactAddress_) {
- this.driverContactAddress_ = driverContactAddress_;
- }
-
- public String getPlaceOfPractice() {
- return placeOfPractice;
- }
-
- public void setPlaceOfPractice(String placeOfPractice) {
- this.placeOfPractice = placeOfPractice;
+ public void setBirthday(Date birthday) {
+ this.birthday = birthday;
}
@Override
@@ -187,20 +187,16 @@
", name='" + name + '\'' +
", sex=" + sex +
", driverContactAddress='" + driverContactAddress + '\'' +
+ ", driverContactAddress_='" + driverContactAddress_ + '\'' +
", idCard='" + idCard + '\'' +
", idCardImgUrl1='" + idCardImgUrl1 + '\'' +
", idCardImgUrl2='" + idCardImgUrl2 + '\'' +
", getDriverLicenseDate=" + getDriverLicenseDate +
- ", type=" + type +
- ", placeOfEmployment='" + placeOfEmployment + '\'' +
+ ", type='" + type + '\'' +
+ ", email='" + email + '\'' +
+ ", placeOfPracticeId=" + placeOfPracticeId +
", headImgUrl='" + headImgUrl + '\'' +
- ", driveCardImgUrl='" + driveCardImgUrl + '\'' +
- ", networkCarlssueImg='" + networkCarlssueImg + '\'' +
- ", taxiAptitudeCard='" + taxiAptitudeCard + '\'' +
+ ", driveCardImgUrl2='" + driveCardImgUrl2 + '\'' +
'}';
}
-
-
-
-
}
--
Gitblit v1.7.1