Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-11-07 6f3344a6bd18ba6a188aa694478ebcdbfef56b87

 src/main/java/com/zy/crm/manager/controller/PlanController.java

@@ -262,8 +262,7 @@
            InputStream inputStream = file.getInputStream();
            // 获取文件的内容类型
            String contentType = file.getContentType();
            String suffix = getFileSuffix(file.getOriginalFilename());
            String url = ossService.upload(inputStream, suffix,contentType);
            String url = ossService.upload(inputStream, file.getOriginalFilename(), contentType);
//            String url = "http://tjdt.oss-cn-hangzhou.aliyuncs.com/"+file.getOriginalFilename();
            String[] names = url.split("com/");
            String name= names[1];