From f5ab83dfad01c87828232af8cd18c676e69fd917 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期三, 21 五月 2025 09:14:11 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java | 9 ++++----- 1 files changed, 4 insertions(+), 5 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..26a3e56 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 @@ -7,10 +7,10 @@ import com.doumee.config.annotation.CloudRequiredPermission; 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.LoginUserInfo; -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.LoginUserInfo; +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.core.utils.DateUtil; import com.doumee.dao.business.model.Bookings; @@ -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