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

peng

9 天以前 b83b070dc8cc823c877aa3a2ade134272ec0641a

 framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java

@@ -297,4 +297,12 @@
     * @return
     */
    Result esSearch(VideoEsQuery query);

    /**
     * 获取播放记录
     *
     * @param query
     * @return
     */
    Result getHistoryPage(VideoHistoryQuery query);
}