From 75cf445527ffa583fd7ff1e98a5958ae585ea704 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Sat, 29 Feb 2020 10:59:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=9C=B0=E5=9D=80=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EnterpriseInfoServiceImpl.java           | 2 +-
 .../epdc/dto/epdc/form/CompleteRequisiteUserInfoDTO.java  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
index deb7d69ed..f9e4e2563 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
@@ -156,7 +156,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
 
         // 更新用户表数据
         CompleteRequisiteUserInfoDTO userInfoDTO = ConvertUtils.sourceToTarget(enterpriseInfo, CompleteRequisiteUserInfoDTO.class);
-        userInfoDTO.setDwellingPlace(enterpriseInfo.getEnterpriseAddress());
+        userInfoDTO.setAddress(enterpriseInfo.getEnterpriseAddress());
         userInfoDTO.setGrid(gridName);
         Result updateUserResult = userFeignClient.completeRequisiteInfo(userInfoDTO);
         if (!updateUserResult.success()) {
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/CompleteRequisiteUserInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/CompleteRequisiteUserInfoDTO.java
index 59f68fadd..fb37fa0df 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/CompleteRequisiteUserInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/CompleteRequisiteUserInfoDTO.java
@@ -45,14 +45,14 @@ public class CompleteRequisiteUserInfoDTO implements Serializable {
 
     private String userId;
 
-    private String dwellingPlace;
+    private String address;
 
     private String wxUnionId;
 
-    /**网格名称*/
+    /**
+     * 网格名称
+     */
     private String grid;
 
 
-
-
 }