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

xiangpei

6 天以前 2226679bda25ddf977f12367a9a37fcf4e377249

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

@@ -46,6 +46,8 @@
     */
    IPage recommendVideo(IPage page, @Param("query") VideoQuery query);

    IPage recommendHealthVideo(IPage page, @Param("query") WxHealthVideoQuery query);

    /**
     * 批量更新视频收藏数量
     *