From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
index 9434c9d..af3c879 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -9,6 +9,7 @@
 import com.baomidou.mybatisplus.annotations.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 
@@ -145,6 +146,8 @@
 
     @ApiModelProperty(value = "后台充值余额")
     private BigDecimal backgroundBalance;
+    @ApiModelProperty(value = "优惠券余额")
+    private BigDecimal couponBalance;
     @ApiModelProperty(value = "启用冻结理由")
     private String remark;
 
@@ -168,6 +171,7 @@
     private String areaName;
 
     @ApiModelProperty(value = "驾驶证初次领证时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date firstCertificateTime;
     @ApiModelProperty(value = "佣金")
     private BigDecimal commission;
@@ -188,6 +192,13 @@
     @ApiModelProperty(value = "邀请人电话")
     private String inviterPhone;
 
+    public BigDecimal getCouponBalance() {
+        return couponBalance;
+    }
+
+    public void setCouponBalance(BigDecimal couponBalance) {
+        this.couponBalance = couponBalance;
+    }
 
     public String getInviterName() {
         return inviterName;

--
Gitblit v1.7.1