From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 adb4238..9640ea9 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
@@ -3,6 +3,8 @@
import lombok.Data;
+import java.util.List;
+
/**
* @author ChenJiaHe
* 鍒嗛〉鎵╁睍绫�*/
@@ -20,10 +22,11 @@
private String parentId;
/**鍒嗙被鏍囪瘑*/
private String typeId;
-
- //appid
+ private List<String> typeIdList;
+ /**appid*/
private String appId;
-
+ /*** 闂ㄥ簵ID**/
+ private String shopId;
public Integer getPageNum() {
if(this.pageNum == null || this.pageNum < 0){
--
Gitblit v1.8.0