From 49ecdc73115d94e343cbe271c154fe32e8888c7d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 23 五月 2024 14:42:09 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
index 47b1682..fec87ee 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
@@ -1,12 +1,13 @@
 package com.doumee.service.business;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.admin.response.DevWgResponseParam;
 import com.doumee.dao.business.model.Bookings;
+import com.doumee.dao.business.vo.RoomStatisticsVo;
 import com.doumee.dao.system.dto.UserStatisticsDTO;
-import com.doumee.dao.system.vo.RoomStatisticsVo;
 import com.doumee.dao.system.vo.UserStatisticsVo;
 import com.doumee.dao.web.request.BookingsRequest;
 import com.doumee.dao.web.request.MeetingPageRequest;
@@ -39,21 +40,21 @@
      *
      * @param id 涓婚敭
      */
-    void deleteById(Integer id);
+    void deleteById(Integer id,LoginUserInfo user);
 
     /**
      * 鍒犻櫎
      *
      * @param bookings 瀹炰綋瀵硅薄
      */
-    void delete(Bookings bookings);
+    void delete(Bookings bookings,LoginUserInfo user);
 
     /**
      * 鎵归噺涓婚敭鍒犻櫎
      *
      * @param ids 涓婚敭闆�
      */
-    void deleteByIdInBatch(List<Integer> ids);
+    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);
 
     /**
      * 涓婚敭鏇存柊
@@ -185,7 +186,7 @@
      * @param yearNum
      * @return
      */
-    List<RoomStatisticsVo> getRoomStatistics( Integer yearNum);
+    List<RoomStatisticsVo> getRoomStatistics(Integer yearNum);
 
 
     /**

--
Gitblit v1.9.3