From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java |  164 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 139 insertions(+), 25 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java
index 3eb742a..a1bc4ec 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java
@@ -20,66 +20,180 @@
      * 主键
      */
     @TableId(value = "id", type = IdType.AUTO)
-    @TableField("id")
     private Integer id;
     /**
      * 负责人姓名
      */
-    @TableField("principal")
+    @TableField(value = "principal")
     private String principal;
     /**
      * 负责人电话
      */
-    @TableField("principalPhone")
+    @TableField(value = "principalPhone")
     private String principalPhone;
     /**
      * 邮箱
      */
-    @TableField("email")
+    @TableField(value = "email")
     private String email;
-    /**
-     * 代理区域省名称
-     */
-    @TableField("provinceName")
-    private String provinceName;
     /**
      * 代理区域省编号
      */
-    @TableField("provinceCode")
+    @TableField(value = "provinceCode")
     private String provinceCode;
+    /**
+     * 代理区域省名称
+     */
+    @TableField(value = "provinceName")
+    private String provinceName;
     /**
      * 代理区域市编号
      */
-    @TableField("cityCode")
+    @TableField(value = "cityCode")
     private String cityCode;
     /**
      * 代理区域市名称
      */
-    @TableField("cityName")
+    @TableField(value = "cityName")
     private String cityName;
     /**
      * 状态(1=正常,2=冻结,3=删除)
      */
-    @TableField("status")
+    @TableField(value = "status")
     private Integer status;
     /**
      * 添加时间
      */
-    @TableField("createTime")
+    @TableField(value = "createTime")
     private Date createTime;
-    /**
-     * 开户银行
-     */
-    @TableField("bankDeposit")
-    private String bankDeposit;
-    /**
-     * 银行账号
-     */
-    @TableField("bankAccount")
-    private String bankAccount;
     /**
      * 客服电话
      */
-    @TableField("serviceCalls")
+    @TableField(value = "serviceCalls")
     private String serviceCalls;
+    /**
+     * 商户类型(1=个体工商户,2=企业)
+     */
+    @TableField("userType")
+    private Integer userType;
+    /**
+     * 公司名称
+     */
+    @TableField("merchantName")
+    private String merchantName;
+    /**
+     * 经营范围
+     */
+    @TableField("businessScope")
+    private String businessScope;
+    /**
+     * 统一社会信用码
+     */
+    @TableField("socialCreditCode")
+    private String socialCreditCode;
+    /**
+     * 统一社会信用证有效期
+     */
+    @TableField("socialCreditCodeExpires")
+    private Date socialCreditCodeExpires;
+    /**
+     * 企业注册省编号
+     */
+    @TableField("provCodeEnterprise")
+    private String provCodeEnterprise;
+    /**
+     * 企业注册市编号
+     */
+    @TableField("cityCodeEnterprise")
+    private String cityCodeEnterprise;
+    /**
+     * 企业注册区编号
+     */
+    @TableField("areaCodeEnterprise")
+    private String areaCodeEnterprise;
+    /**
+     * 企业注册详细地址
+     */
+    @TableField("address")
+    private String address;
+    /**
+     * 法人姓名
+     */
+    @TableField("legalPerson")
+    private String legalPerson;
+    /**
+     * 法人身份证号码
+     */
+    @TableField("merchantIDCode")
+    private String merchantIDCode;
+    /**
+     * 法人身份证有效期
+     */
+    @TableField("certIdExpires")
+    private Date certIdExpires;
+    /**
+     * 法人手机号
+     */
+    @TableField("legalPhone")
+    private String legalPhone;
+    /**
+     * 附件编号
+     */
+    @TableField("fileNo")
+    private String fileNo;
+    /**
+     * 结算账户名
+     */
+    @TableField("cardName")
+    private String cardName;
+    /**
+     * 结算账户号
+     */
+    @TableField("cardNo")
+    private String cardNo;
+    /**
+     * 银行账户类型(1=对公,2=对私)
+     */
+    @TableField("bankAcctType")
+    private Integer bankAcctType;
+    /**
+     * 银行预留手机号
+     */
+    @TableField("phone")
+    private String phone;
+    /**
+     * 开户行编号
+     */
+    @TableField("bankCode")
+    private String bankCode;
+    /**
+     * 开户行地区省编号
+     */
+    @TableField("provCodeBank")
+    private String provCodeBank;
+    /**
+     * 开户行地区市编号
+     */
+    @TableField("cityCodeBank")
+    private String cityCodeBank;
+    /**
+     * 开户行地区区编号
+     */
+    @TableField("areaCodeBank")
+    private String areaCodeBank;
+    /**
+     * 商户号
+     */
+    @TableField("merchantNumber")
+    private String merchantNumber;
+    /**
+     * 商户状态(0=审核中,1=已成功,2=审核失败)
+     */
+    @TableField("merchantStatus")
+    private Integer merchantStatus;
+    /**
+     * 结算账户状态(0=审核中,1=已成功,2=审核失败)
+     */
+    @TableField("bankStatus")
+    private Integer bankStatus;
 }

--
Gitblit v1.7.1