From 8c2a413d2574151a2bc762aa0779f766de48160b Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 18:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
index c294089..505b9c3 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
@@ -1,5 +1,7 @@
package com.ruoyi.common.core.web.page;
+import io.swagger.annotations.ApiModel;
+
import java.io.Serializable;
import java.util.List;
@@ -8,7 +10,8 @@
*
* @author ruoyi
*/
-public class TableDataInfo implements Serializable
+@ApiModel
+public class TableDataInfo<T> implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -16,7 +19,7 @@
private long total;
/** 列表数据 */
- private List<?> rows;
+ private List<T> rows;
/** 消息状态码 */
private int code;
@@ -37,7 +40,7 @@
* @param list 列表数据
* @param total 总记录数
*/
- public TableDataInfo(List<?> list, int total)
+ public TableDataInfo(List<T> list, int total)
{
this.rows = list;
this.total = total;
@@ -58,7 +61,7 @@
return rows;
}
- public void setRows(List<?> rows)
+ public void setRows(List<T> rows)
{
this.rows = rows;
}
--
Gitblit v1.7.1