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

peng

4 天以前 211b5a717de92b9b52879280ca2285cdd0b4a54b

 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);
}