From b5ae703a499b97fd83dd9a7b67a10a7b8157df5f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 09 十一月 2023 13:29:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index e2269f5..0903dc2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -60,9 +60,11 @@
     private Map<String, Object> params;
 
     @TableField(exist = false)
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
     private Integer pageNum;
 
     @TableField(exist = false)
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
     private Integer pageSize;
 
     public Integer getPageNum() {

--
Gitblit v1.9.3