From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 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