From f664bea25bee4609721dd8fbbcc0205878772d9a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 二月 2023 16:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 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 28384d5..a1ff618 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")
@@ -118,6 +123,11 @@
@TableField("balance")
private Double balance;
/**
+ * 后台充值余额
+ */
+ @TableField("backgroundBalance")
+ private Double backgroundBalance;
+ /**
* 审核状态（1=待审核，2=已同意，3=已拒绝）
*/
@TableField("approvalStatus")
@@ -148,13 +158,68 @@
@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")
private Date createTime;
+ /**
+ * 加盟区域省编号
+ */
+ @TableField("provinceCode")
+ private String provinceCode;
+ /**
+ * 加盟区域省名称
+ */
+ @TableField("provinceName")
+ private String provinceName;
+ /**
+ * 加盟区域市编号
+ */
+ @TableField("cityCode")
+ private String cityCode;
+ /**
+ * 加盟区域市名称
+ */
+ @TableField("cityName")
+ private String cityName;
+ /**
+ * 加盟区域区编号
+ */
+ @TableField("areaCode")
+ private String areaCode;
+ /**
+ * 加盟区域区名称
+ */
+ @TableField("areaName")
+ private String areaName;
+ /**
+ * 佣金
+ */
+ @TableField("commission")
+ private Double commission;
+ /**
+ * 微信收款码
+ */
+ @TableField("wxCollectionCode")
+ private String wxCollectionCode;
+ /**
+ * 支付宝收款码
+ */
+ @TableField("zfbCollectionCode")
+ private String zfbCollectionCode;
}
--
Gitblit v1.7.1