From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java |   98 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java
index 35d7d97..1c7d878 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java
@@ -27,6 +27,11 @@
     @TableField("phone")
     private String phone;
     /**
+     * 手机号运营商
+     */
+    @TableField("phoneOperator")
+    private String phoneOperator;
+    /**
      * 登录密码
      */
     @TableField("password")
@@ -37,10 +42,15 @@
     @TableField("withdrawPassword")
     private String withdrawPassword;
     /**
-     * 姓名
+     * 姓
      */
-    @TableField("name")
-    private String name;
+    @TableField("lastName")
+    private String lastName;
+    /**
+     * 名
+     */
+    @TableField("firstName")
+    private String firstName;
     /**
      * 性别（1=男，2=女）
      */
@@ -152,10 +162,20 @@
     @TableField("driveCard")
     private String driveCard;
     /**
-     * 驾驶证照片
+     * 驾驶证照片正面
      */
-    @TableField("driveCardImgUrl")
-    private String driveCardImgUrl;
+    @TableField("driveCardImgUrl1")
+    private String driveCardImgUrl1;
+    /**
+     * 驾驶证照片背面
+     */
+    @TableField("driveCardImgUrl2")
+    private String driveCardImgUrl2;
+    /**
+     * 邮箱
+     */
+    @TableField("email")
+    private String email;
     /**
      * 准驾车型
      */
@@ -287,6 +307,11 @@
     @TableField("carId")
     private Integer carId;
     /**
+     * 语言（1=简体中文，2=英语，3=法语）
+     */
+    @TableField("language")
+    private Integer language;
+    /**
      * 审核状态(1=待审核，2=正常，3=冻结，4=拒绝)
      */
     @TableField("authState")
@@ -412,6 +437,14 @@
         this.phone = phone;
     }
 
+    public String getPhoneOperator() {
+        return phoneOperator;
+    }
+
+    public void setPhoneOperator(String phoneOperator) {
+        this.phoneOperator = phoneOperator;
+    }
+
     public String getPassword() {
         return password;
     }
@@ -420,12 +453,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() {
@@ -588,12 +629,28 @@
         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 getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
     }
 
     public String getDriverType() {
@@ -900,6 +957,14 @@
         this.withdrawPassword = withdrawPassword;
     }
 
+    public Integer getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(Integer language) {
+        this.language = language;
+    }
+
     @Override
     public String toString() {
         return "Driver{" +
@@ -908,7 +973,6 @@
                 ", phone='" + phone + '\'' +
                 ", password='" + password + '\'' +
                 ", withdrawPassword='" + withdrawPassword + '\'' +
-                ", name='" + name + '\'' +
                 ", sex=" + sex +
                 ", idCard='" + idCard + '\'' +
                 ", companyId=" + companyId +
@@ -931,7 +995,8 @@
                 ", driverContactAddress_='" + driverContactAddress_ + '\'' +
                 ", driverAge=" + driverAge +
                 ", driveCard='" + driveCard + '\'' +
-                ", driveCardImgUrl='" + driveCardImgUrl + '\'' +
+                ", driveCardImgUrl1='" + driveCardImgUrl1 + '\'' +
+                ", driveCardImgUrl2='" + driveCardImgUrl2 + '\'' +
                 ", driverType='" + driverType + '\'' +
                 ", getDriverLicenseDate=" + getDriverLicenseDate +
                 ", driverLicenseOn=" + driverLicenseOn +
@@ -970,6 +1035,7 @@
                 ", qrCode='" + qrCode + '\'' +
                 ", uid=" + uid +
                 ", uType=" + uType +
+                ", frozenMoney=" + frozenMoney +
                 '}';
     }
 }

--
Gitblit v1.7.1