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

zxl

9 天以前 f7e2789a576b2db4217d20d5cfdeb20249c83a5b

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

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

    List<WxVideoVO> recommendVideoList(@Param("query") VideoQuery query);

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