From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
index 26b82df..68fe0b7 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
@@ -61,10 +61,10 @@
private String type;
@ApiModelProperty("从业地(带分隔符)")
private String placeOfPractice;
- @ApiModelProperty("从业地行政区域代码")
- private String placeOfEmployment;
+ @ApiModelProperty("从业地id")
+ private String placeOfPracticeId;
@ApiModelProperty("驾驶证照片")
- private String driveCardImgUrl1;
+ private String driveCardImgUrl;
@ApiModelProperty("驾驶证照片")
private String driveCardImgUrl2;
@ApiModelProperty("网约车资格证照片")
@@ -90,6 +90,10 @@
private String qrCode;
@ApiModelProperty("二维码是否打开 true打开，false关闭")
private Boolean qrCodeIsOpen;
+ @ApiModelProperty("生日")
+ private String birthday;
+ @ApiModelProperty("居住地")
+ private String driverAddress;
public Integer getId() {
return id;
@@ -307,20 +311,20 @@
this.placeOfPractice = placeOfPractice;
}
- public String getPlaceOfEmployment() {
- return placeOfEmployment;
+ public String getPlaceOfPracticeId() {
+ return placeOfPracticeId;
}
- public void setPlaceOfEmployment(String placeOfEmployment) {
- this.placeOfEmployment = placeOfEmployment;
+ public void setPlaceOfPracticeId(String placeOfPracticeId) {
+ this.placeOfPracticeId = placeOfPracticeId;
}
- public String getDriveCardImgUrl1() {
- return driveCardImgUrl1;
+ public String getDriveCardImgUrl() {
+ return driveCardImgUrl;
}
- public void setDriveCardImgUrl1(String driveCardImgUrl1) {
- this.driveCardImgUrl1 = driveCardImgUrl1;
+ public void setDriveCardImgUrl(String driveCardImgUrl) {
+ this.driveCardImgUrl = driveCardImgUrl;
}
public String getDriveCardImgUrl2() {
@@ -403,6 +407,22 @@
this.qrCodeIsOpen = qrCodeIsOpen;
}
+ public String getBirthday() {
+ return birthday;
+ }
+
+ public void setBirthday(String birthday) {
+ this.birthday = birthday;
+ }
+
+ public String getDriverAddress() {
+ return driverAddress;
+ }
+
+ public void setDriverAddress(String driverAddress) {
+ this.driverAddress = driverAddress;
+ }
+
public static DriverInfoWarpper getDriverInfoWarpper(Map<String, Object> map){
DriverInfoWarpper driverInfoWarpper = new DriverInfoWarpper();
if(null != map){
@@ -437,13 +457,15 @@
driverInfoWarpper.setGetDriverLicenseDate(null != map.get("getDriverLicenseDate") ? String.valueOf(map.get("getDriverLicenseDate")) : "");
driverInfoWarpper.setType(null != map.get("type") ? String.valueOf(map.get("type")) : "");
driverInfoWarpper.setPlaceOfPractice(null != map.get("placeOfPractice") ? String.valueOf(map.get("placeOfPractice")) : "");
- driverInfoWarpper.setDriveCardImgUrl1(null != map.get("driveCardImgUrl1") ? String.valueOf(map.get("driveCardImgUrl1")) : "");
+ driverInfoWarpper.setDriveCardImgUrl(null != map.get("driveCardImgUrl") ? String.valueOf(map.get("driveCardImgUrl")) : "");
driverInfoWarpper.setDriveCardImgUrl2(null != map.get("driveCardImgUrl2") ? String.valueOf(map.get("driveCardImgUrl2")) : "");
driverInfoWarpper.setNetworkCarlssueImg(null != map.get("networkCarlssueImg") ? String.valueOf(map.get("networkCarlssueImg")) : "");
- driverInfoWarpper.setPlaceOfEmployment(null != map.get("placeOfEmployment") ? String.valueOf(map.get("placeOfEmployment")) : "");
+ driverInfoWarpper.setPlaceOfPracticeId(null != map.get("placeOfPracticeId") ? String.valueOf(map.get("placeOfPracticeId")) : "");
driverInfoWarpper.setLaveActivityMoney(null != map.get("laveActivityMoney") ? Double.valueOf(String.valueOf(map.get("laveActivityMoney"))) : 0);
driverInfoWarpper.setLaveBusinessMoney(null != map.get("laveBusinessMoney") ? Double.valueOf(String.valueOf(map.get("laveBusinessMoney"))) : 0);
driverInfoWarpper.setLanguage(null != map.get("language") ? Integer.valueOf(String.valueOf(map.get("language"))) : 2);
+ driverInfoWarpper.setBirthday(null != map.get("birthday") ? String.valueOf(map.get("birthday")) : "");
+ driverInfoWarpper.setDriverAddress(null != map.get("driverAddress") ? String.valueOf(map.get("driverAddress")) : "");
}
return driverInfoWarpper;
}
--
Gitblit v1.7.1