From 1e2308326c98c1d95b3d75ab1cac80bb6f828344 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 16 六月 2023 20:17:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TBranchOffice.java |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 105 insertions(+), 0 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TBranchOffice.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TBranchOffice.java
index 324c224..e7af820 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TBranchOffice.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TBranchOffice.java
@@ -1,10 +1,13 @@
 package com.stylefeng.guns.modular.system.model;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.enums.IdType;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 
 /**
@@ -73,7 +76,109 @@
      * 添加时间
      */
     private Date createTime;
+    /**
+     * 分公司名称
+     */
+    private String branchOfficeName;
+    /**
+     * 经营业务 1司机代驾
+     */
+    private Integer operatingBusiness;
 
+    /**
+     * 开户银行
+     */
+    @TableField(value = "bankDeposit")
+    @ApiModelProperty(value = "开户银行")
+    private String bankDeposit;
+
+    /**
+     * 银行账户
+     */
+    @TableField(value = "bankAccount")
+    @ApiModelProperty(value = "银行账户")
+    private String bankAccount;
+
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "区域")
+    private String area;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "区域id")
+    private String areaId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "账号")
+    private String account;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getBankDeposit() {
+        return bankDeposit;
+    }
+
+    public void setBankDeposit(String bankDeposit) {
+        this.bankDeposit = bankDeposit;
+    }
+
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getBranchOfficeName() {
+        return branchOfficeName;
+    }
+
+    public void setBranchOfficeName(String branchOfficeName) {
+        this.branchOfficeName = branchOfficeName;
+    }
+
+    public Integer getOperatingBusiness() {
+        return operatingBusiness;
+    }
+
+    public void setOperatingBusiness(Integer operatingBusiness) {
+        this.operatingBusiness = operatingBusiness;
+    }
 
     public Integer getId() {
         return id;

--
Gitblit v1.7.1