Merge remote-tracking branch 'origin/dev_New' into dev_New

buhuazhen

9 天以前 b7eb6e87b4d88e5a419b64e3e3d0e5dc1be0f48f

 src/main/java/com/ruoyi/collaborativeApproval/service/MeetingService.java

@@ -14,6 +14,7 @@
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;
@@ -42,7 +43,7 @@

// ************申请会议************

    void saveMeetApplication(MeetApplication meetApplication);
    R<Void> saveMeetApplication(MeetApplication meetApplication);

// ************申请审批************