Merge remote-tracking branch 'remotes/origin/dev'

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java

@@ -262,7 +262,7 @@ public class UserBaseInfoRedis {
                 }else{
                     return null;
                 }
-                RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId);
+                RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserIdAndCustomerId(userId,customerId);
                 if(null != relation && StringUtils.isNotBlank(relation.getGridId())){
                     baseInfo.setCustomerId(relation.getCustomerId());
                 }else{