From d1c49f422ed80522020c1be841edc6e1f71a46d5 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 05 十二月 2023 18:08:30 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
index 6f739e5..7be55d0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
@@ -10,6 +10,8 @@
* */
@Data
public class UserReportDto {
+ /**杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
/**鍛樺伐鏍囪瘑*/
private String userId;
/**寮�濮嬫椂闂�*/
@@ -18,5 +20,15 @@
private String endTime;
/**闂ㄥ簵鏍囪瘑*/
private List<String> shopIdList;
+ /**绉戝鏍囪瘑*/
+ private List<String> roomList;
+ /**鍖荤敓鏍囪瘑*/
+ private List<String> doctorIdList;
+ /**浼氬憳绛夌骇*/
+ private List<String> userLevelList;
+ /**浼氬憳鐘舵��*/
+ private List<String> userStatusList;
+ /**澧為暱涓績鏄犲皠椤圭洰*/
+ private List<String> upProjectIdList;
}
--
Gitblit v1.8.0