From 19fa90abbc2043b73bef3992428d912d011fc8c5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 09:59:49 +0800
Subject: [PATCH] 合并代码
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgent.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgent.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgent.java
index 9f59268..db8e4b7 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgent.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgent.java
@@ -31,46 +31,57 @@
/**
* 负责人姓名
*/
+ @TableField(value = "principal")
private String principal;
/**
* 负责人电话
*/
+ @TableField(value = "principalPhone")
private String principalPhone;
/**
* 邮箱
*/
+ @TableField(value = "email")
private String email;
/**
* 代理区域省编号
*/
+ @TableField(value = "provinceCode")
private String provinceCode;
/**
* 代理区域省名称
*/
+ @TableField(value = "provinceName")
private String provinceName;
/**
* 代理区域市编号
*/
+ @TableField(value = "cityCode")
private String cityCode;
/**
* 代理区域市名称
*/
+ @TableField(value = "cityName")
private String cityName;
/**
* 代理区域区编号
*/
+ @TableField(value = "districtCode")
private String districtCode;
/**
* 代理区域区名称
*/
+ @TableField(value = "districtName")
private String districtName;
/**
* 状态（1=正常，2=冻结，3=删除）
*/
+ @TableField(value = "status")
private Integer status;
/**
* 添加时间
*/
+ @TableField(value = "createTime")
private Date createTime;
@TableField(value = "serviceCalls")
@ApiModelProperty(value = "客服电话")
@@ -218,22 +229,6 @@
@TableField(exist = false)
@ApiModelProperty(value = "密码")
private String password;
-
- public String getDistrictCode() {
- return districtCode;
- }
-
- public void setDistrictCode(String districtCode) {
- this.districtCode = districtCode;
- }
-
- public String getDistrictName() {
- return districtName;
- }
-
- public void setDistrictName(String districtName) {
- this.districtName = districtName;
- }
public String getAccount() {
return account;
@@ -555,6 +550,22 @@
this.bankStatus = bankStatus;
}
+ public String getDistrictCode() {
+ return districtCode;
+ }
+
+ public void setDistrictCode(String districtCode) {
+ this.districtCode = districtCode;
+ }
+
+ public String getDistrictName() {
+ return districtName;
+ }
+
+ public void setDistrictName(String districtName) {
+ this.districtName = districtName;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1