From 168c5450e3493852059da54d698d08c2269b91fc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 17:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
index 045ba54..124eb08 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
@@ -151,7 +151,6 @@
     @PostMapping("/exportUserStatistics")
     @CloudRequiredPermission("business:bookings:exportExcel")
     public void exportUserStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-
         List<UserStatisticsVo> records = bookingsService.getUserStatistics(pageWrap).getRecords();
         if (!CollectionUtils.isEmpty(records)){
             JSONArray o = (JSONArray) JSON.toJSON(records);

--
Gitblit v1.9.3