From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 c750997..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,7 +12,10 @@
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","records"})
+ @JSONField(name="list",alternateNames = {"rows","list"})
private List<T> list ;// object[] False 鏉冮檺缁勫璞″垪琛�
}
--
Gitblit v1.9.3