From a1acacfb8cfa4b0e2fc07fbf214f4f9b47636c98 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 15 三月 2024 18:44:10 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

---
 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