From 5d3b07a294a1bd3d6e01f3f2f9e0ec8b80f7cc0f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 14 Aug 2020 15:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java
index 3aa16a6..c4be091 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java
@@ -38,9 +38,17 @@
@NotEmpty(message = "公司名称不能为空")
private String companyName;
/**
- * 公司所在区域编号
+ * 省名称
*/
- private Long companyArea;
+ private String companyProvince;
+ /**
+ * 市名称
+ */
+ private String companyCity;
+ /**
+ * 县名称
+ */
+ private String companyArea;
/**
* 公司联系电话
*/
@@ -69,4 +77,8 @@
* 是否删除，1删除，0未删除
*/
private Boolean isDel;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
}
--
Gitblit v1.8.0