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

zxl

4 天以前 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec

 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);

    /**
     * 上传单个文件
     *