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

cjl

2023-12-18 68e750bf109efb0469704e54e48a29649512358c

 screen-api/src/main/java/com/moral/api/pojo/enums/FileType.java

@@ -41,6 +41,11 @@
     * 压缩包
     */
    ZIP(5),

    /**
     * 压缩包
     */
    MP4(6),
    ;

    @EnumValue