From 75a2623173bcc4a235aa1f99f7ef28519186160b Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:24:25 +0800
Subject: [PATCH] 代码调整

---
 UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java |   22 ----------------------
 1 files changed, 0 insertions(+), 22 deletions(-)

diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java
index bb8afb3..2c27096 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java
@@ -37,10 +37,6 @@
     private String emergencyContact;
     @ApiModelProperty("紧急联系人电话")
     private String emergencyContactNumber;
-    @ApiModelProperty("是否买过打车卡(0=否,1=是)")
-    private Integer payTaxiCar;
-    @ApiModelProperty("是否开通商家(0=否,1=是)")
-    private Integer merchant;
 
     public Integer getId() {
         return id;
@@ -146,22 +142,6 @@
         this.balance = balance;
     }
 
-    public Integer getPayTaxiCar() {
-        return payTaxiCar;
-    }
-
-    public void setPayTaxiCar(Integer payTaxiCar) {
-        this.payTaxiCar = payTaxiCar;
-    }
-
-    public Integer getMerchant() {
-        return merchant;
-    }
-
-    public void setMerchant(Integer merchant) {
-        this.merchant = merchant;
-    }
-
     @Override
     public String toString() {
         return "UserInfoWarpper{" +
@@ -197,8 +177,6 @@
             userInfoWarpper.setEmergencyContact(null != map.get("emergencyContact") ? String.valueOf(map.get("emergencyContact")) : "");
             userInfoWarpper.setEmergencyContactNumber(null != map.get("emergencyContactNumber") ? String.valueOf(map.get("emergencyContactNumber")) : "");
             userInfoWarpper.setBalance(null != map.get("balance") ? Double.valueOf(String.valueOf(map.get("balance"))) : 0);
-            userInfoWarpper.setPayTaxiCar(null != map.get("payTaxiCar") ? Integer.valueOf(String.valueOf(map.get("payTaxiCar"))) : 0);
-            userInfoWarpper.setMerchant(null != map.get("merchant") ? Integer.valueOf(String.valueOf(map.get("merchant"))) : 0);
         }
         return userInfoWarpper;
     }

--
Gitblit v1.7.1