From 20a8522ef718550929985606138fcfb640859afb Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期四, 30 十一月 2023 11:08:39 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/GroupUserReportDto.java | 34 ++++++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java | 9 ++++++---
2 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/GroupUserReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/GroupUserReportDto.java
new file mode 100644
index 0000000..2f1a467
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/GroupUserReportDto.java
@@ -0,0 +1,34 @@
+package com.hz.his.dto.report;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 浼佷笟寰俊缇ゆ姤琛�
+ * @author fwq
+ * */
+@Data
+public class GroupUserReportDto {
+ /**鏍囪瘑*/
+ private String id;
+ /**绉戝鍚嶇О*/
+ private String roomName;
+ /**鍛樺伐鏍囪瘑闆嗗悎*/
+ private List<String> employeeIdList;
+ /**闂ㄥ簵鏍囪瘑闆嗗悎*/
+ private List<String> shopIdList;
+ /**鐢ㄦ埛鐘舵��*/
+ private List<String> userStatusList;
+ /**鎵ц鏁�*/
+ private Integer deductionNum;
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿鏁版嵁:0涓嶈繃婊�,1杩囨护*/
+ private Integer isFilterTestAccount;
+}
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..659b138 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,15 @@
import java.util.List;
/**
- * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * 鐢ㄦ埛鏁版嵁鏌ヨ
* @author fwq
* */
@Data
public class UserReportListDto {
-
+ /**鐢ㄦ埛鏁版嵁*/
private List<UserReportDto> list;
-
+ /**杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
+ /**涓撳尯鏍囪瘑*/
+ private List<String> zoneList;
}
--
Gitblit v1.8.0