From 67926388d2b3b96f6360af6d70fdc56596b6b39d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期日, 28 四月 2024 16:31:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq-积分抵扣现金' into master-fwq-积分抵扣现金

---
 phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java
index 9ecebc0..310fcb9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java
@@ -14,5 +14,8 @@
     private List<UserReportDto> list;
     /**杩囨护娴嬭瘯璐﹀彿*/
     private Integer isFilterTestAccount;
-
+    /**涓撳尯鏍囪瘑*/
+    private List<String> zoneList;
+    /**涓撳尯鐢ㄦ埛鏍囪瘑*/
+    private List<String> userIdList;
 }

--
Gitblit v1.8.0