From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java | 24 ++++++++++++++++++++++--
1 files changed, 22 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 9434c9d..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;
@@ -145,6 +146,8 @@
@ApiModelProperty(value = "后台充值余额")
private BigDecimal backgroundBalance;
+ @ApiModelProperty(value = "优惠券余额")
+ private BigDecimal couponBalance;
@ApiModelProperty(value = "启用冻结理由")
private String remark;
@@ -168,10 +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;
@@ -188,6 +196,13 @@
@ApiModelProperty(value = "邀请人电话")
private String inviterPhone;
+ public BigDecimal getCouponBalance() {
+ return couponBalance;
+ }
+
+ public void setCouponBalance(BigDecimal couponBalance) {
+ this.couponBalance = couponBalance;
+ }
public String getInviterName() {
return inviterName;
@@ -540,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