From bc798685f11aeec95e64c25b0a4594d8876d881d Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期五, 02 八月 2024 14:25:12 +0800 Subject: [PATCH] Merge branch 'master-base' into master-test --- 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