From e54b3676d2ee5b71892760e5ca9de22519be845f Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Tue, 3 Sep 2019 17:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/elink/esua/epdc/dto/UserDTO.java | 10 ++++++++++
.../com/elink/esua/epdc/controller/UserController.java | 2 +-
.../java/com/elink/esua/epdc/entity/UserEntity.java | 10 ++++++++++
.../src/main/resources/mapper/UserDao.xml | 5 +++++
4 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
index 889fa2cf3..8d241fa17 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
@@ -146,4 +146,14 @@ public class UserDTO implements Serializable {
*/
private Integer state;
+ private String grid;
+
+ private String street;
+
+ private String streetId;
+
+ private String community;
+
+ private String communityId;
+
}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
index 644c3c5f6..62690326d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
@@ -42,7 +42,7 @@ import java.util.Map;
* @since v1.0.0 2019-09-02
*/
@RestController
-@RequestMapping("epdc/user")
+@RequestMapping("user")
public class UserController {
@Autowired
private UserService userService;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java
index b8ff4847d..ba14ce0b2 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java
@@ -170,4 +170,14 @@ public class UserEntity extends BaseEpdcEntity {
*/
private Integer state;
+ private String grid;
+
+ private String street;
+
+ private String streetId;
+
+ private String community;
+
+ private String communityId;
+
}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index be9256fbe..3a71a759b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -43,6 +43,11 @@
+
+
+
+
+