From 64e2700126f64883aa982a11660c71e43a2a9f84 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 19 一月 2024 17:18:37 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 a3c2d8b..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
@@ -5,12 +5,17 @@
 import java.util.List;
 
 /**
- * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * 鐢ㄦ埛鏁版嵁鏌ヨ
  * @author fwq
  * */
 @Data
 public class UserReportListDto {
-
+    /**鐢ㄦ埛鏁版嵁*/
     private List<UserReportDto> list;
-
+    /**杩囨护娴嬭瘯璐﹀彿*/
+    private Integer isFilterTestAccount;
+    /**涓撳尯鏍囪瘑*/
+    private List<String> zoneList;
+    /**涓撳尯鐢ㄦ埛鏍囪瘑*/
+    private List<String> userIdList;
 }

--
Gitblit v1.8.0