From 174051f74a5842466c68c0601832fbb5a952608e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 十二月 2022 18:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
index fa00de5..8dbfbd0 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
@@ -26,16 +26,6 @@
     @RequestMapping(value = "/cos/upload-multipart",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     Result upload(@RequestPart("file") MultipartFile file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName);
 
-
-    /**
-     *涓婁紶鍥剧墖锛堣浆鍖栧疄浣揊ileUpdateDto锛�
-     * @param file 鏂囦欢
-     * @param folderCode 瀛樺偍鏂囦欢澶�,姣斿鍟嗗搧杞挱鍥�:/goods/banner
-     * @param bucketName 瀛樺偍妗跺悕绉�
-     * @return
-     */
-    @RequestMapping(value = "/cos/upload-file")
-    Result upload(@RequestParam("file") File file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName);
     /**
      *涓嬭浇鍥剧墖
      * 鍙互浣跨敤 FileDownUtil.downToFile()鏂规硶杞寲涓烘枃浠�

--
Gitblit v1.8.0