From 9308ec4dcadc96f4d93541148fa844cfcc70c762 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 18 五月 2023 16:44:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Driver.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Driver.java
index 85cd45b..54ea90c 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Driver.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Driver.java
@@ -128,6 +128,11 @@
     @TableField("backgroundBalance")
     private Double backgroundBalance;
     /**
+     * 优惠券余额(订单优惠券支付的金额)
+     */
+    @TableField("couponBalance")
+    private Double couponBalance;
+    /**
      * 审核状态(1=待审核,2=已同意,3=已拒绝)
      */
     @TableField("approvalStatus")
@@ -222,4 +227,24 @@
      */
     @TableField("zfbCollectionCode")
     private String zfbCollectionCode;
+    /**
+     * 商户号
+     */
+    @TableField("merchantNumber")
+    private String merchantNumber;
+    /**
+     * 商户姓名
+     */
+    @TableField("merchantName")
+    private String merchantName;
+    /**
+     * 商户电话
+     */
+    @TableField("merchantPhone")
+    private String merchantPhone;
+    /**
+     * 商户身份证号码
+     */
+    @TableField("merchantIDCode")
+    private String merchantIDCode;
 }

--
Gitblit v1.7.1