修改合并出现的问题

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberLoginServiceImpl.java

@@ -812,7 +812,7 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
         Integer memberLevelTypeEnum = MemberLevelTypeEnum.getCodeByMemberType(roleDO.getMemberType().getTypeEnum());
 
         //缓存用户信息
-        memberCacheService.cacheUserInfo(UserLoginSourceEnum.BUSINESS_WEB, memberLevelTypeEnum, memberUserDO, memberDO, roleDO, upperChannelMemberIds, upperVendorMembers, subChannelMembers, new ArrayList<>(), token);
+        memberCacheService.cacheUserInfo(UserLoginSourceEnum.BUSINESS_WEB, memberLevelTypeEnum, memberUserDO, memberDO, roleDO, upperChannelMemberIds, upperVendorMembers, subChannelMembers, new ArrayList<>(), new ArrayList<>(), token);
 
         //返回结果
         WebLoginBO webLoginBO = new WebLoginBO(memberUserDO.getLuUserId(),memberUserDO.getId(), memberDO.getId(), token, memberUserDO.getAccount(), memberDO.getName(), memberUserDO.getName(), ServiceVariable.WEB_LOGIN_TOKEN_EXPIRE_MINUTES, urlList, roleDO.getId(), roleDO.getMemberType().getTypeEnum(), roleDO.getRoleType().getTypeEnum(), roleNames, validateStatus, validateStatusDesc, validateMsg, level, levelTag, score, creditPoint, logo, roleItemList);