From 16772c5dc27772c2eee57d2eab061ad15e8ad87e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 29 二月 2024 11:43:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
index e65e0b2..52a6202 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
@@ -71,16 +71,16 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- //@RequiresPermissions("business:visitevent:query")
- public ApiResponse<PageData<VisitEventDTO>> findPage (@RequestBody PageWrap<VisitEvent> pageWrap) {
+ @RequiresPermissions("business:visitevent:query")
+ public ApiResponse<PageData<VisitEvent>> findPage (@RequestBody PageWrap<VisitEvent> pageWrap) {
return ApiResponse.success(visitEventService.findVisitPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- //@RequiresPermissions("business:visitevent:exportExcel")
+ @RequiresPermissions("business:visitevent:exportExcel")
public void exportExcel (@RequestBody PageWrap<VisitEvent> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(VisitEventVo.class).export(visitEventService.findPageExcel(pageWrap), "璁垮浜嬩欢鎺ㄩ�佽褰曡〃", response);
+ ExcelExporter.build(VisitEvent.class).export(visitEventService.findPageExcel(pageWrap), "璁垮鍑哄叆浜嬩欢_" + System.currentTimeMillis(), response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
--
Gitblit v1.9.3