Merge branch 'xgh_内容中台' into 'developer'

test

See merge request !449

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/UploadController.java

@@ -40,7 +40,7 @@ public class UploadController extends WebBaseController {
     private EnterpriseService enterpriseService ;
 
 
-    @RequestMapping("upload-img11")
+    @RequestMapping("upload-img")
     @IgnoreLogin
     public HaobanResponse imgUpload(HttpServletRequest request) throws Exception {
         MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
@@ -74,7 +74,7 @@ public class UploadController extends WebBaseController {
     }
     
     // fileType image:图片 video:视频  file:文件 audio音频 other:其它
-    @RequestMapping("upload-img")
+    @RequestMapping("upload-img-fee")
     @IgnoreLogin
     public HaobanResponse imgUploadFee(HttpServletRequest request , String fileType , String enterpriseId) throws Exception {
         MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;