From 41b6d0c9c00b24534a90bbd4cdeb0537cb889c67 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 09:49:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/collaborativeApproval/service/MeetingService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/MeetingService.java b/src/main/java/com/ruoyi/collaborativeApproval/service/MeetingService.java
index 898ca94..d3b0d89 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/MeetingService.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/MeetingService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.collaborativeApproval.dto.MeetSummaryDto;
import com.ruoyi.collaborativeApproval.dto.MeetUseDto;
import com.ruoyi.collaborativeApproval.dto.MeetingSimpleDto;
@@ -13,11 +14,12 @@
import com.ruoyi.collaborativeApproval.vo.SearchMeetingDraftVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingRoomVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
+import com.ruoyi.framework.web.domain.R;
import java.util.List;
-public interface MeetingService{
+public interface MeetingService extends IService<MeetingRoom> {
//****************浼氳瀹�********************************
IPage<MeetingRoom> getMeetingRoomList(SearchMeetingRoomVo vo);
@@ -41,7 +43,7 @@
// ************鐢宠浼氳************
- void saveMeetApplication(MeetApplication meetApplication);
+ R<Void> saveMeetApplication(MeetApplication meetApplication);
// ************鐢宠瀹℃壒************
--
Gitblit v1.9.3