Merge remote-tracking branch 'origin/dev_bugfix' into dev

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java

@@ -50,4 +50,8 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
      * */
     private List<String> userRoleList;
 
+    /**
+     *
+     */
+    private String userStreetName;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

@@ -304,8 +304,10 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         userResiInfoDao.selectUserResiInfoDTO(userResiParam);
         if(null == resiResult){
             visitedFormDTO.setIsReg(NumConstant.ZERO_STR);
+            resultObj.setUserStreetName(ModuleConstant.EMPTY_STR);
         }else{
             visitedFormDTO.setIsReg(NumConstant.ONE_STR);
+            resultObj.setUserStreetName(resiResult.getShowName());
         }
         if(!gridVisitedService.saveVisitedRecord(visitedFormDTO).success()){
             log.warn(ModuleConstant.SAVE_VISITED_RECORD_FAILURE);