From 19fa90abbc2043b73bef3992428d912d011fc8c5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 09:59:49 +0800
Subject: [PATCH] 合并代码

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java |   71 ++++++++++++++++++++++++++++++++++-
 1 files changed, 69 insertions(+), 2 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 fdb2968..4789217 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;
 
@@ -131,6 +132,10 @@
      */
     private Integer integral;
     /**
+     * 剩余积分
+     */
+    private Double score;
+    /**
      * 状态（1=正常，2=冻结，3=删除）
      */
     private Integer status;
@@ -141,6 +146,8 @@
 
     @ApiModelProperty(value = "后台充值余额")
     private BigDecimal backgroundBalance;
+    @ApiModelProperty(value = "优惠券余额")
+    private BigDecimal couponBalance;
     @ApiModelProperty(value = "启用冻结理由")
     private String remark;
 
@@ -164,8 +171,15 @@
     private String areaName;
 
     @ApiModelProperty(value = "驾驶证初次领证时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date firstCertificateTime;
-
+    @ApiModelProperty(value = "佣金")
+    private BigDecimal commission;
+    /**
+     * 在线时长
+     */
+    @TableField("onlineTime")
+    private Long onlineTime;
     @TableField(exist = false)
     @ApiModelProperty(value = "区域")
     private String area;
@@ -173,6 +187,54 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "区域id")
     private String areaId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "邀请人姓名")
+    private String inviterName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "邀请人电话")
+    private String inviterPhone;
+
+    public BigDecimal getCouponBalance() {
+        return couponBalance;
+    }
+
+    public void setCouponBalance(BigDecimal couponBalance) {
+        this.couponBalance = couponBalance;
+    }
+
+    public String getInviterName() {
+        return inviterName;
+    }
+
+    public void setInviterName(String inviterName) {
+        this.inviterName = inviterName;
+    }
+
+    public String getInviterPhone() {
+        return inviterPhone;
+    }
+
+    public void setInviterPhone(String inviterPhone) {
+        this.inviterPhone = inviterPhone;
+    }
+
+    public BigDecimal getCommission() {
+        return commission;
+    }
+
+    public void setCommission(BigDecimal commission) {
+        this.commission = commission;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
 
     public String getArea() {
         return area;
@@ -493,7 +555,12 @@
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
+    public Long getOnlineTime() {
+        return onlineTime;
+    }
+    public void setOnlineTime(Long onlineTime) {
+        this.onlineTime = onlineTime;
+    }
     @Override
     protected Serializable pkVal() {
         return this.id;

--
Gitblit v1.7.1