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

zxl

昨天 d33b041f4b2a63a22682c9b3f344ef35f84b4542

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

@@ -18,6 +18,8 @@
 */
public interface LmkFileService extends IService<LmkFile> {

    Result generateVideoCoverUrl(String videoId, Long snapshotTime, Integer width, Integer height);

    /**
     * 上传单个文件
     *