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/api/business/BookingsController.java | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java index b4fcbb8..ae1402f 100644 --- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java +++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java @@ -6,10 +6,10 @@ 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.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; @@ -17,13 +17,11 @@ import com.doumee.dao.system.dto.UserStatisticsDTO; import com.doumee.dao.system.vo.UserStatisticsVo; import com.doumee.dao.web.response.DateTimeResourceDate; -import com.doumee.dao.web.response.MeetingDetailResponse; import com.doumee.service.business.BookingsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -- Gitblit v1.9.3