From 1267661c4028d4adb6629b3c6f00c686aa35eb8a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 09:05:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java
index 8182b65..2ce3d29 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java
@@ -26,7 +26,6 @@
 @RestController
 @Api(tags = {"������������������"})
 @RequestMapping("coordinate")
-@CrossOrigin(origins = "*", maxAge = 3600)
 public class ManageCoordinateController {
 
     @Autowired

--
Gitblit v1.8.0