Merge remote-tracking branch 'origin/master'

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/UploadFilePath.java

@@ -29,14 +29,14 @@ public class UploadFilePath {
     /**
      * 场景视频
      */
-    public static final String VIDEOS_EDIT_PATH =  "scene_edit_data/%s/videos/";
-    public static final String VIDEOS_VIEW_PATH =  "scene_view_data/%s/videos/";
+    public static final String VIDEOS_EDIT_PATH =  "scene_edit_data/%s/video/";
+    public static final String VIDEOS_VIEW_PATH =  "scene_view_data/%s/video/";
 
     /**
      * 场景音频
      */
-    public static final String VOICE_EDIT_PATH =  "scene_edit_data/%s/voices/";
-    public static final String VOICE_VIEW_PATH =  "scene_view_data/%s/voices/";
+    public static final String VOICE_EDIT_PATH =  "scene_edit_data/%s/voice/";
+    public static final String VOICE_VIEW_PATH =  "scene_view_data/%s/voice/";
 
     public static final String SCENE_NUM_PATH = "scene/%s";
     public static final String IMG_CACHES_PATH =  "scene/%s/caches/images/";