Merge branch 'dev_oss_fix' into dev_temp

# Conflicts:
#	epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java

epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java

@@ -30,6 +30,8 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallback =
         OssFeignClientFallback.class)
+//@FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallback =
+//        OssFeignClientFallback.class)
 public interface OssFeignClient {
     /**
      * 文件上传
@@ -43,7 +45,8 @@ public interface OssFeignClient {
     @PostMapping(value ="oss/file/uploadqrcode", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     Result<UploadImgResultDTO> uploadQrCode(@RequestPart(value = "file") MultipartFile file);
 
-    @Configuration
+
+    //@Configuration
     class MultipartSupportConfig {
         @Bean
         public Encoder feignFormEncoder() {