From 831e3312572cf29dd91cbd882ef3dce809ac852d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
index 18e5e42..aecd536 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
@@ -19,10 +19,12 @@
private String name;
@ApiModelProperty("电话")
private String phone;
- @ApiModelProperty("优推开始时间")
- private Long youTuiStart;
+ @ApiModelProperty("优推结束时间")
+ private Long youTuiEnd;
@ApiModelProperty("账户余额")
private Double balance;
+ @ApiModelProperty("可提现余额")
+ private Double withdrawBalance;
@ApiModelProperty("佣金余额")
private Double commission;
@ApiModelProperty("积分")
@@ -31,7 +33,7 @@
private Integer todayNum;
@ApiModelProperty("本月接单")
private Integer monthNum;
- @ApiModelProperty("上班状态（0：没上班，1=一上班）")
+ @ApiModelProperty("上班状态（0：没上班，1=已上班）")
private Integer work;
@ApiModelProperty("在线时长")
private Integer online;
@@ -47,4 +49,12 @@
private Integer wechatAuthorization;
@ApiModelProperty("客服电话")
private String serviceCalls;
+ @ApiModelProperty("商户号")
+ private String merchantNumber;
+ @ApiModelProperty("商户姓名")
+ private String merchantName;
+ @ApiModelProperty("商户电话")
+ private String merchantPhone;
+ @ApiModelProperty("商户身份证号码【1.1】")
+ private String merchantIDCode;
}
--
Gitblit v1.7.1