From 753c4aede53b07041841d9aa94859b59e366bd5d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 18:47:39 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java | 26 +++++++++++++++++++++++---
1 files changed, 23 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 4d02dbd..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,17 +19,21 @@
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("积分")
private Integer integral;
@ApiModelProperty("今日接单")
private Integer todayNum;
@ApiModelProperty("本月接单")
private Integer monthNum;
- @ApiModelProperty("上班状态（0：没上班，1=一上班）")
+ @ApiModelProperty("上班状态（0：没上班，1=已上班）")
private Integer work;
@ApiModelProperty("在线时长")
private Integer online;
@@ -37,4 +41,20 @@
private String emergencyContact;
@ApiModelProperty("紧急联系人电话")
private String emergencyPhone;
+ @ApiModelProperty("微信收款码")
+ private String wxCollectionCode;
+ @ApiModelProperty("支付宝收款码")
+ private String zfbCollectionCode;
+ @ApiModelProperty("是否微信授权（0=否，1=是）")
+ 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