From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/OssController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/OssController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/OssController.java
index 4560bfe..5ea2804 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/OssController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/OssController.java
@@ -11,6 +11,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
+@CrossOrigin
@RestController
@RequestMapping("/base/oss")
public class OssController {
--
Gitblit v1.7.1