From e52227b01983146f2e3c81dc575141d8b9889497 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 10:16:30 +0800
Subject: [PATCH] 代码调整

---
 DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
index ed10958..7e11de3 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
@@ -53,7 +53,7 @@
     private String idCardImgUrl2;
     @ApiModelProperty("初次领取驾驶证日期")
     private String getDriverLicenseDate;
-    @ApiModelProperty("服务模式(1=专车/快车,2=出租车,3=机场专线,7=景区直通车,8=公务出行)多个以逗号分隔")
+    @ApiModelProperty("服务模式(1=专车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)多个以逗号分隔")
     private String type;
     @ApiModelProperty("从业地(带分隔符)")
     private String placeOfPractice;
@@ -63,8 +63,6 @@
     private String driveCardImgUrl;
     @ApiModelProperty("网约车资格证照片")
     private String networkCarlssueImg;
-    @ApiModelProperty("是否开通商家(0=否,1=是)")
-    private Integer merchant;
 
     public Integer getId() {
         return id;
@@ -290,14 +288,6 @@
         this.laveBusinessMoney = laveBusinessMoney;
     }
 
-    public Integer getMerchant() {
-        return merchant;
-    }
-
-    public void setMerchant(Integer merchant) {
-        this.merchant = merchant;
-    }
-
     @Override
     public String toString() {
         return "DriverInfoWarpper{" +
@@ -363,7 +353,6 @@
             driverInfoWarpper.setPlaceOfEmployment(null != map.get("placeOfEmployment") ? String.valueOf(map.get("placeOfEmployment")) : "");
             driverInfoWarpper.setLaveActivityMoney(null != map.get("laveActivityMoney") ? Double.valueOf(String.valueOf(map.get("laveActivityMoney"))) : 0);
             driverInfoWarpper.setLaveBusinessMoney(null != map.get("laveBusinessMoney") ? Double.valueOf(String.valueOf(map.get("laveBusinessMoney"))) : 0);
-            driverInfoWarpper.setMerchant(null != map.get("merchant") ? Integer.valueOf(String.valueOf(map.get("merchant"))) : 0);
         }
         return driverInfoWarpper;
     }

--
Gitblit v1.7.1