From 9b426ebdbe9d283cd6f01719db9a00f2533df286 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 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 cbcd0e0..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("居住地(带分隔符)")
@@ -36,7 +38,7 @@
     @ApiModelProperty("头像")
     private String headImgUrl;
     @ApiModelProperty("驾驶证照片正面")
-    private String driveCardImgUrl1;
+    private String driveCardImgUrl;
     @ApiModelProperty("驾驶证照片背面")
     private String driveCardImgUrl2;
 
@@ -153,12 +155,12 @@
         this.headImgUrl = headImgUrl;
     }
 
-    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() {
@@ -167,6 +169,14 @@
 
     public void setDriveCardImgUrl2(String driveCardImgUrl2) {
         this.driveCardImgUrl2 = driveCardImgUrl2;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
     }
 
     @Override
@@ -186,7 +196,6 @@
                 ", email='" + email + '\'' +
                 ", placeOfPracticeId=" + placeOfPracticeId +
                 ", headImgUrl='" + headImgUrl + '\'' +
-                ", driveCardImgUrl1='" + driveCardImgUrl1 + '\'' +
                 ", driveCardImgUrl2='" + driveCardImgUrl2 + '\'' +
                 '}';
     }

--
Gitblit v1.7.1