From 9b74b477139659d69fcf321d160724aa1cd90ce0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 18:49:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/system_service/src/main/java/com/doumee/api/system/NoticesController.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/api/system/NoticesController.java b/server/system_service/src/main/java/com/doumee/api/system/NoticesController.java
index 6f3811e..470023a 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/NoticesController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/NoticesController.java
@@ -3,9 +3,9 @@
 import com.doumee.api.BaseController;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.model.Notices;
 import com.doumee.service.system.NoticesService;
@@ -13,12 +13,14 @@
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.web.bind.annotation.*;
 /**
  * @author 姹熻箘韫�
  * @date 2024/01/16 10:03

--
Gitblit v1.9.3