From 2afab36ee741434cb83f33c74695faa11aae3707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 19 Apr 2022 13:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/util/page/PageInfo.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/salary/util/page/PageInfo.java b/src/com/engine/salary/util/page/PageInfo.java
index b6b226a16..4bf022f2f 100644
--- a/src/com/engine/salary/util/page/PageInfo.java
+++ b/src/com/engine/salary/util/page/PageInfo.java
@@ -13,9 +13,9 @@ import java.util.List;
 public class PageInfo<T> extends com.github.pagehelper.PageInfo<T> {
     Class<T> clazz;
 
-//    public void setColumns(List<Column> columns) {
-//        this.columns = columns;
-//    }
+    public void setColumns(List<Column> columns) {
+        this.columns.addAll(columns);
+    }
 
     List<Column> columns = new ArrayList<>();
     List<DataSource> dataSource = new ArrayList<>();
@@ -39,7 +39,7 @@ public class PageInfo<T> extends com.github.pagehelper.PageInfo<T> {
 
     public List<Column> getColumns() {
         if(clazz==null){
-            return new ArrayList<>();
+            return this.columns;
         }
         Field[] fields = clazz.getDeclaredFields();
         for (Field f : fields) {