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

peng

6 天以前 745af316b6f14cc97f6cb64d56eda4cb68960c3e

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

@@ -230,4 +230,11 @@

    Result delKitchen(String id);

    /**
     * 视频商品查看
     *
     * @param videoId
     * @return
     */
    Result getGoodsDetail(String videoId);
}