From 20c644e44d92fa02b873fb6189eee71615bc12d2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/pojo/enums/FileType.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/enums/FileType.java b/screen-api/src/main/java/com/moral/api/pojo/enums/FileType.java
index c90a951..54f7615 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/enums/FileType.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/enums/FileType.java
@@ -41,6 +41,11 @@
      * ���������
      */
     ZIP(5),
+
+    /**
+     * ���������
+     */
+    MP4(6),
     ;
 
     @EnumValue

--
Gitblit v1.8.0