From 97d7e38d0d0dc419672f9a6dbb12ac0e7f145553 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 24 十月 2023 17:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 4b8f070..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,7 +48,7 @@
}
public Integer getPageSize() {
- if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 500){
+ 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