diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java index e48c913..021a082 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java @@ -44,9 +44,15 @@ public class SupermarketInfoController extends BaseController { //@RequiresPermissions("supermarket:info:list") @GetMapping("/list") public TableDataInfo list(SupermarketInfo supermarketInfo) { - if (supermarketInfo.isPagenation()) { - startPage(); - } + startPage(); + List list = supermarketInfoService.selectSupermarketInfoList(supermarketInfo); + return getDataTable(list); + } + + @ApiOperation(value = "查询超市列表(不分页)") + //@RequiresPermissions("supermarket:info:list") + @GetMapping("/listAll") + public TableDataInfo listAll(SupermarketInfo supermarketInfo) { List list = supermarketInfoService.selectSupermarketInfoList(supermarketInfo); return getDataTable(list); }