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

peng

4 天以前 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85

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

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

    WxVideoVO recommendVideoByVideoId( @Param("query") VideoQuery query);

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

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