会议预约，订餐预定

ruoyi-admin/src/main/java/com/ruoyi/web/controller/conference/ConferenceRoomController.java

@@ -45,6 +45,16 @@ public class ConferenceRoomController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询会议室列表不分页
+     */
+    @PreAuthorize("@ss.hasPermi('system:room:listNoPage')")
+    @GetMapping("/listNoPage")
+    public TableDataInfo listNoPage(ConferenceRoom conferenceRoom) {
+        List<ConferenceRoom> list = conferenceRoomService.selectConferenceRoomList(conferenceRoom);
+        return getDataTable(list);
+    }
+
     /**
      * 导出会议室列表
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/conference/ConferenceRoomOrderController.java

@@ -83,7 +83,7 @@ public class ConferenceRoomOrderController extends BaseController {
     @Log(title = "会议室预约", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
     public AjaxResult edit(@RequestBody ConferenceRoomOrder conferenceRoomOrder) {
-        return toAjax(conferenceRoomOrderService.updateConferenceRoomOrder(conferenceRoomOrder));
+        return conferenceRoomOrderService.updateConferenceRoomOrder(conferenceRoomOrder);
     }
 
     /**