Merge remote-tracking branch 'origin/release-2024-04-25' into release-2024-04-25

luoo_comment/src/main/java/com/luoo/comment/controller/CommentController.java

@@ -430,7 +430,7 @@ public class CommentController extends BaseController {
         List<CommentResp> list = (List<CommentResp>) cacheChannel.get(Constants.J2CACHE_REGION_JOURNAL_COMMENT_PAGE_CHILDREN+"_"+parentId,page+"_"+size, key->getChildrenCommentList(parentId,page,size),true).getValue();
 //        List<CommentResp> list = getChildrenCommentList(parentId,page,size);
         //验证是否登录，并且拿到ID
-        Integer count = (Integer) cacheChannel.get(Constants.J2CACHE_REGION_JOURNAL_COMMENT_PAGE_CHILDREN_COUNT,parentId, key->getChildrenCommentListCount(parentId,page,size),true).getValue();
+        String count =  cacheChannel.get(Constants.J2CACHE_REGION_JOURNAL_COMMENT_PAGE_CHILDREN_COUNT,parentId, key->getChildrenCommentListCount(parentId,page,size),true).getValue().toString();
         UserLoginDto userLoginDto = getUserLoginDto(authorization);
         if (null == userLoginDto) {
 

luoo_user/src/main/java/com/luoo/user/pojo/Carousel.java

@@ -43,7 +43,7 @@ public class Carousel implements Serializable {
 	private String imgPath;
 
 	/**
-	 * 0:歌曲 1:期刊 2:外部连接 3:文章
+	 * 0:歌曲 1:期刊 2:外部连接 3:文章 4:专栏 5:抽奖详情 6:抽奖列表
 	 */
 	@ApiModelProperty(value = "0:歌曲 1:期刊 2:外部连接 3:文章")
 	private Integer objectType;