user/role/tright 7.19

src/main/java/com/pangding/web/authority/vo/cloudvo/LoginResVo.java

@@ -28,6 +28,16 @@ public class LoginResVo {
 
     private List<AuthorityListByLevelResVo> authorityListByLevel;
 
+    private Merchant merchant;
+
+    public Merchant getMerchant() {
+        return merchant;
+    }
+
+    public void setMerchant(Merchant merchant) {
+        this.merchant = merchant;
+    }
+
     public String getUrl() {
         return url;
     }

src/main/java/com/pangding/web/authority/vo/reqvo/CompanyBankCardGetReqVo.java

@@ -13,6 +13,16 @@ public class CompanyBankCardGetReqVo {
 
     private Integer isDefault;
 
+    private String bankCardCode;
+
+    public String getBankCardCode() {
+        return bankCardCode;
+    }
+
+    public void setBankCardCode(String bankCardCode) {
+        this.bankCardCode = bankCardCode;
+    }
+
     public Integer getIsDefault() {
         return isDefault;
     }

src/main/java/com/pangding/web/authority/vo/reqvo/CompanyBankReqVo.java

@@ -33,7 +33,7 @@ public class CompanyBankReqVo {
     /**
      * 类型 公司 个人
      */
-    private String type;
+    private Integer type;
 
     /**
      * 公司id
@@ -115,11 +115,11 @@ public class CompanyBankReqVo {
         this.bankCode = bankCode;
     }
 
-    public String getType() {
+    public Integer getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(Integer type) {
         this.type = type;
     }
 

src/main/java/com/pangding/web/authority/vo/resvo/LoginCompanyResVo.java

 package com.pangding.web.authority.vo.resvo;
 
+import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.CompanyVo;
 
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.List;
 public class LoginCompanyResVo {
     private CompanyVo companyVo;
 
-    private List<String> bankCardCodeList;
+    private List<CompanyBankCardVo> bankCardVoList;
 
     public CompanyVo getCompanyVo() {
         return companyVo;
@@ -21,11 +22,11 @@ public class LoginCompanyResVo {
         this.companyVo = companyVo;
     }
 
-    public List<String> getBankCardCodeList() {
-        return bankCardCodeList;
+    public List<CompanyBankCardVo> getBankCardVoList() {
+        return bankCardVoList;
     }
 
-    public void setBankCardCodeList(List<String> bankCardCodeList) {
-        this.bankCardCodeList = bankCardCodeList;
+    public void setBankCardVoList(List<CompanyBankCardVo> bankCardVoList) {
+        this.bankCardVoList = bankCardVoList;
     }
 }