From 56eba9cded865648465bc2c5815d47441e0457b1 Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 15:35:52 +0800
Subject: [PATCH] Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
index 0c73ea8..b63c155 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@@ -42,9 +42,7 @@
@GetMapping("/list")
public TableDataInfo list(SysPost post)
{
- startPage();
- List<SysPost> list = postService.selectPostList(post);
- return getDataTable(list);
+ return postService.selectPagePostList(post);
}
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
--
Gitblit v1.9.3