Merge branch 'dev-2.0.0' into dev-2.0.1

mitao

2 天以前 b3427a36d9e8de608f018ca433ebf1315e8a3210

Merge branch 'dev-2.0.0' into dev-2.0.1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MimeTypeUtils.java

@@ -36,7 +36,10 @@
            // 视频格式
            "mp4", "avi", "rmvb",
            // pdf
            "pdf" };
            "pdf" ,
            //音频
            "mp3","mpeg"
    };

    public static String getExtension(String prefix)
    {