From 499737916d0cb59092c04d6523d4607ff0a5556a Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 13 十一月 2023 16:39:54 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
index ab01413..c05f351 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
@@ -24,4 +24,7 @@
     private String sleepTime;
     /**闂ㄥ簵鍒楄〃鏍囪瘑*/
     private List<String> shopIdList;
+
+    /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+    private Integer isFilterTestAccount;
 }

--
Gitblit v1.8.0