Merge branch 'dev' into test

b5bcd547 · wuwenlong · 7c70d58e · 31647cea · b5bcd547
Commit b5bcd547 authored Jan 20, 2024 by wuwenlong
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

SRoomController.java ...ain/java/share/web/controller/system/SRoomController.java +2 -2

No files found.
--- a/share-front/src/main/java/share/web/controller/system/SRoomController.java
+++ b/share-front/src/main/java/share/web/controller/system/SRoomController.java
@@ -46,10 +46,10 @@ public class SRoomController extends BaseController {
     */
    @ApiOperation(value = "房间列表")
    @GetMapping("/list")
-    public TableDataInfo list(SRoom sRoom) {
+    public R<List<SRoomVo>> list(SRoom sRoom) {
        startPage();
        List<SRoomVo> list = sRoomService.selectSRoomVoList(sRoom);
-        return getDataTable(list);
+        return R.ok(list);
    }