From 7454b6532cd2a5c68235a45f1cc540e25f1ffaf4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 四月 2023 18:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java |    6 +++---
 1 files changed, 3 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..34c37a4 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,8 +19,8 @@
     private String name;
     @ApiModelProperty("电话")
     private String phone;
-    @ApiModelProperty("优推开始时间")
-    private Long youTuiStart;
+    @ApiModelProperty("优推结束时间")
+    private Long youTuiEnd;
     @ApiModelProperty("账户余额")
     private Double balance;
     @ApiModelProperty("佣金余额")
@@ -31,7 +31,7 @@
     private Integer todayNum;
     @ApiModelProperty("本月接单")
     private Integer monthNum;
-    @ApiModelProperty("上班状态(0:没上班,1=一上班)")
+    @ApiModelProperty("上班状态(0:没上班,1=已上班)")
     private Integer work;
     @ApiModelProperty("在线时长")
     private Integer online;

--
Gitblit v1.7.1