Merge branch 'dev' into user_action

peng

2025-09-19 b7df7af3289cabe6cf8a23f314d803fc144a913e

 framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java

@@ -63,13 +63,5 @@
     */
    IPage getStoreCollectPage(IPage page,@Param("userId")String userId);

    /**
     * 获得我的收藏 视频
     * @param page
     * @param userId
     * @return
     */
    IPage getVideoCollectPage(IPage page,@Param("userId")String userId);

    IPage getGoodsCollectPage(IPage page,@Param("userId")String type);
}