From 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 23 八月 2024 16:20:08 +0800
Subject: [PATCH] Merge branch 'master-xlk' into master-xlk-test

---
 phis-feign/src/main/java/com/hz/his/dto/PageDto.java |    5 +++--
 1 files changed, 3 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 6d9e6b9..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
@@ -23,9 +23,10 @@
     /**鍒嗙被鏍囪瘑*/
     private String typeId;
     private List<String> typeIdList;
-    //appid
+    /**appid*/
     private String appId;
-
+    /*** 闂ㄥ簵ID**/
+    private String shopId;
 
     public Integer getPageNum() {
         if(this.pageNum == null || this.pageNum < 0){

--
Gitblit v1.8.0