diff --git a/src/main/java/com/muyu/gen/controller/GenController.java b/src/main/java/com/muyu/gen/controller/GenController.java index d3dc03a..cc15a90 100644 --- a/src/main/java/com/muyu/gen/controller/GenController.java +++ b/src/main/java/com/muyu/gen/controller/GenController.java @@ -42,11 +42,11 @@ public class GenController extends BaseController */ @RequiresPermissions("tool:gen:list") @GetMapping("/list") - public TableDataInfo genList(GenTable genTable) + public Result genList(GenTable genTable) { startPage(); List list = genTableService.selectGenTableList(genTable); - return getDataTable(list).getData(); + return getDataTable(list); } /** @@ -71,24 +71,24 @@ public class GenController extends BaseController */ @RequiresPermissions("tool:gen:list") @GetMapping("/db/list") - public TableDataInfo dataList(GenTable genTable) + public Result dataList(GenTable genTable) { startPage(); List list = genTableService.selectDbTableList(genTable); - return getDataTable(list).getData(); + return getDataTable(list); } /** * 查询数据表字段列表 */ @GetMapping(value = "/column/{tableId}") - public TableDataInfo columnList(Long tableId) + public Result columnList(Long tableId) { TableDataInfo dataInfo = new TableDataInfo(); List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); dataInfo.setRows(list); dataInfo.setTotal(list.size()); - return dataInfo; + return success(dataInfo); } /**