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

liyong

2 天以前 893d4fad6e5612ea01c8dab60a89187136ebd23b

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

@@ -83,8 +83,7 @@

    @PostMapping("/saveMeetingApplication")
    public R saveMeetApplication(@RequestBody MeetApplication meetApplication) {
        meetingService.saveMeetApplication(meetApplication);
        return R.ok();
       return meetingService.saveMeetApplication(meetApplication);
    }

    @PostMapping("/applicationList")