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

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java

@@ -43,7 +43,6 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
 	 **/
 	@Override
 	public LatestGridInfoResultDTO getLatestGridInfo(TokenDto tokenDto) {
-		LatestGridInfoResultDTO latestGridInfoResultDTO=new LatestGridInfoResultDTO();
 		if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) {
 			logger.error(String.format("居民端【%s】获取用户最近访问的网格失败:错误提示:%s",tokenDto.getUserId(),ModuleConstant.USER_NOT_NULL));
 			throw new RenException(ModuleConstant.USER_NOT_NULL);
@@ -57,7 +56,7 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
 			return userResult.getData();
 		}
 		logger.error(String.format("居民端用户【%s】获取用户最近访问网格失败,调用%s服务入参userId:%s,错误码:%s,错误提示:%s", tokenDto.getUserId(),ServiceConstant.EPMET_USER_SERVER,tokenDto.getUserId(),userResult.getCode(),userResult.getMsg()));
-		return latestGridInfoResultDTO;
+		return null;
 	}
 
 	/**