From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
index bee6d79..6d9e6b9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
@@ -1,10 +1,17 @@
package com.hz.his.dto;
+import lombok.Data;
+
+import java.util.List;
+
/**
* @author ChenJiaHe
* 鍒嗛〉鎵╁睍绫�*/
+@Data
public class PageDto {
+ /**鏍囪瘑*/
+ private String id;
/**褰撳墠椤垫暟*/
private Integer pageNum;
/**褰撳墠椤垫樉绀烘潯鏁�*/
@@ -15,6 +22,9 @@
private String parentId;
/**鍒嗙被鏍囪瘑*/
private String typeId;
+ private List<String> typeIdList;
+ //appid
+ private String appId;
public Integer getPageNum() {
@@ -38,8 +48,8 @@
}
public Integer getPageSize() {
- if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 500){
- this.pageSize = 20;
+ if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 800){
+ this.pageSize = 800;
}
return this.pageSize;
}
@@ -80,4 +90,12 @@
public void setTypeId(String typeId) {
this.typeId = typeId;
}
+
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
}
--
Gitblit v1.8.0