From b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 二月 2023 10:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java
index 93c0b4e..fd782b1 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java
@@ -78,6 +78,11 @@
     @TableField("driverLicense")
     private String driverLicense;
     /**
+     * 驾驶证初次领证时间
+     */
+    @TableField("firstCertificateTime")
+    private Date firstCertificateTime;
+    /**
      * 身份证号码
      */
     @TableField("idcard")
@@ -113,6 +118,16 @@
     @TableField("branchOfficeId")
     private Integer branchOfficeId;
     /**
+     * 账户余额
+     */
+    @TableField("balance")
+    private Double balance;
+    /**
+     * 后台充值余额
+     */
+    @TableField("backgroundBalance")
+    private Double backgroundBalance;
+    /**
      * 审核状态(1=待审核,2=已同意,3=已拒绝)
      */
     @TableField("approvalStatus")
@@ -133,11 +148,31 @@
     @TableField("approvalTime")
     private Date approvalTime;
     /**
+     * 服务状态(1=空闲中,2=服务中)
+     */
+    @TableField("serverStatus")
+    private Integer serverStatus;
+    /**
+     * 剩余积分
+     */
+    @TableField("integral")
+    private Integer integral;
+    /**
+     * 评分
+     */
+    @TableField("score")
+    private Double score;
+    /**
      * 状态(1=正常,2=冻结,3=删除)
      */
     @TableField("status")
     private Integer status;
     /**
+     * 启用冻结理由
+     */
+    @TableField("remark")
+    private String remark;
+    /**
      * 添加时间
      */
     @TableField("createTime")

--
Gitblit v1.7.1