diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GovOrgFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridFormDTO.java
similarity index 90%
rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GovOrgFormDTO.java
rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridFormDTO.java
index 753ff28808..c3c237e83a 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GovOrgFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridFormDTO.java
@@ -24,11 +24,11 @@ import java.io.Serializable;
 
 
 /**
- * 居民端-网格链接获取客户首页配置
+ * epmet-user端调用gov-org端的入参
  * @author sun
  */
 @Data
-public class GovOrgFormDTO implements Serializable {
+public class CustomerGridFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
index 0be5ce4745..6f1512042d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
@@ -26,7 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.form.GovOrgFormDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.excel.CustomerGridExcel;
 import com.epmet.service.CustomerGridService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,7 +100,7 @@ public class CustomerGridController {
      * @throws Exception
      */
     @PostMapping("getcustomergridbygridid")
-    public Result<CustomerGridDTO> getCustomerGridByGridId(@RequestBody GovOrgFormDTO formDTO){
+    public Result<CustomerGridDTO> getCustomerGridByGridId(@RequestBody CustomerGridFormDTO formDTO){
         return customerGridService.getCustomerGridByGridId(formDTO);
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index 46ff83c5db..ab9ea706c9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -19,7 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.form.GovOrgFormDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.entity.CustomerGridEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -32,5 +32,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
 
-    CustomerGridDTO getCustomerGridByGridId(GovOrgFormDTO formDTO);
+    CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
index e468ac4d23..8a779d24ca 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
@@ -21,7 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.form.GovOrgFormDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.entity.CustomerGridEntity;
 
 import java.util.List;
@@ -101,5 +101,5 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @return
      * @date 2020-03-17
      */
-    Result<CustomerGridDTO> getCustomerGridByGridId(GovOrgFormDTO formDTO);
+    Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index d61637487d..15f785eb31 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -26,7 +26,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerGridDao;
 import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.form.GovOrgFormDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.entity.CustomerGridEntity;
 import com.epmet.redis.CustomerGridRedis;
 import com.epmet.service.CustomerGridService;
@@ -104,7 +104,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     }
 
     @Override
-    public Result<CustomerGridDTO> getCustomerGridByGridId(GovOrgFormDTO formDTO) {
+    public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO) {
         return new Result<CustomerGridDTO>().ok(baseDao.getCustomerGridByGridId(formDTO));
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 5c585fb4b3..4bce97d08f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -31,7 +31,7 @@
         customer_id,
         CONVERT ( grid_name USING gbk ) ASC
     </select>
-    <select id="getCustomerGridByGridId" parameterType="com.epmet.dto.form.GovOrgFormDTO"
+    <select id="getCustomerGridByGridId" parameterType="com.epmet.dto.form.CustomerGridFormDTO"
             resultType="com.epmet.dto.CustomerGridDTO">
         SELECT
             gr.id,
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
similarity index 97%
rename from epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerController.java
rename to epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
index c35de19740..d39f477e79 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerController.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("stranger")
-public class StrangerController {
+public class StrangerResiGuideController {
 
 	@Autowired
 	private StrangerService strangerService;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index e342b66cd5..5625a3ee76 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -3,7 +3,7 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.form.GovOrgFormDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +22,6 @@ public interface GovOrgFeignClient {
 	 * @Date 2020/3/17
 	 **/
 	@PostMapping("/gov/org/customergrid/getcustomergridbygridid")
-	Result<CustomerGridDTO> getCustomerGridByGridId(GovOrgFormDTO formDTO);
+	Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO);
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index 445df65329..c5e04129bf 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -4,7 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.form.GovOrgFormDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
 
 	@Override
-	public Result<CustomerGridDTO> getCustomerGridByGridId(GovOrgFormDTO formDTO) {
+	public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerGridByGridId",formDTO);
 	}
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
index 757919d603..118e08a214 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
@@ -27,7 +27,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.GridVisitedDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.GridVisitedDTO;
-import com.epmet.dto.form.GovOrgFormDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.VisitedFormDTO;
 import com.epmet.entity.GridVisitedEntity;
 import com.epmet.feign.GovOrgFeignClient;
@@ -119,7 +119,7 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid
     @Transactional(rollbackFor = Exception.class)
     public void saveLatestAndVisited(VisitedFormDTO formDTO) throws Exception {
         //1:调用gov-org服务 查询客户网格表数据
-        GovOrgFormDTO dto = new GovOrgFormDTO();
+        CustomerGridFormDTO dto = new CustomerGridFormDTO();
         dto.setGridId(formDTO.getGridId());
         Result<CustomerGridDTO> result = govOrgFeignClient.getCustomerGridByGridId(dto);
         if(!result.success()){