From e7d554f4f8f79eafaa2de3abe036d21e300fd14a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 17:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/report/GroupUserReportDto.java | 4 ++++
1 files changed, 4 insertions(+), 0 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
index 2f1a467..10a8a68 100644
--- 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
@@ -18,8 +18,12 @@
private List<String> employeeIdList;
/**闂ㄥ簵鏍囪瘑闆嗗悎*/
private List<String> shopIdList;
+ /**缇ゆ爣璇嗛泦鍚�*/
+ private List<String> groupIdList;
/**鐢ㄦ埛鐘舵��*/
private List<String> userStatusList;
+ /**鍝侀」鍚嶇О*/
+ private List<String> projectNameList;
/**鎵ц鏁�*/
private Integer deductionNum;
/**寮�濮嬫椂闂�*/
--
Gitblit v1.8.0