From 59fb524d6b081f0faba177ffd13a0132d314dbae Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 19 十一月 2024 14:15:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
index 3823fba..16e95c5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
@@ -12,6 +12,9 @@
   private int pageSize;//	number	False	姣忛〉璁板綍鎬绘暟
   private int pageNo	;// number	False	褰撳墠椤电爜
   private int totalPage;//	number	False	鎬婚〉鏁�
+  private Boolean  mergeSwitchBool	;//Boolean	false	鍚堝苟寮�鍚姸鎬�
+  private int count;//	Number	false	count
+  private Boolean  lastPage;//	Boolean	false	鏄惁鏄渶鍚庝竴椤�
 
   @JSONField(name="list",alternateNames = {"rows","list"})
   private List<T> list	;// object[]	False	鏉冮檺缁勫璞″垪琛�

--
Gitblit v1.9.3