From 660b072b084f3f765ff8bfcb1abdd7f1cd9ed068 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期二, 28 二月 2023 14:24:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/qxueyou/scc/media/model/MediaVideo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/qxueyou/scc/media/model/MediaVideo.java b/src/main/java/com/qxueyou/scc/media/model/MediaVideo.java
index 8d6d24b..f7616ef 100644
--- a/src/main/java/com/qxueyou/scc/media/model/MediaVideo.java
+++ b/src/main/java/com/qxueyou/scc/media/model/MediaVideo.java
@@ -764,4 +764,4 @@
 	public void setM3u8KeyPath(String m3u8KeyPath) {
 		this.m3u8KeyPath = m3u8KeyPath;
 	}
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0