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

云

2026-04-28 35f74c2abd95e6913180fbccd864915486eecc48

 src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java

@@ -14,8 +14,8 @@
import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -32,7 +32,7 @@
@RestController
@RequestMapping("/meeting")
@RequiredArgsConstructor
@Api(tags = "会议")
@Tag(name = "会议")
public class MeetingController {
    private final MeetingService meetingService;

@@ -126,7 +126,7 @@
        return R.ok(meetingService.getMeetSummaryItems());
    }

    @ApiOperation(value = "会议室设置导出")
    @Operation(summary = "会议室设置导出")
    @PostMapping("/export")
    public void export(HttpServletResponse response) {
        List<MeetingRoom> accountExpenses = meetingService.list();
@@ -136,7 +136,7 @@

    private final MeetDraftMapper meetDraftMapper;

    @ApiOperation(value = "会议草稿导出")
    @Operation(summary = "会议草稿导出")
    @PostMapping("/exportOne")
    public void exportOne(HttpServletResponse response) {
        List<MeetDraft> accountExpenses = meetDraftMapper.selectList(new LambdaQueryWrapper<MeetDraft>());