Merge branch 'local/1030-music' into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserMusicStarServiceImpl.java

@@ -231,6 +231,6 @@ public class UserMusicStarServiceImpl extends ServiceImpl<UserMusicStarMapper, U
         if (CollectionUtils.isEmpty(list)) {
             return new HashMap<>();
         }
-        return list.stream().collect(Collectors.toMap(UserMusicStar::getUserMusicId, o->true));
+        return list.stream().collect(Collectors.toMap(UserMusicStar::getUserMusicId, o->true, (k1, k2) -> k1));
     }
 }