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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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

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

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

    @EnumValue