From 67926388d2b3b96f6360af6d70fdc56596b6b39d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期日, 28 四月 2024 16:31:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq-积分抵扣现金' into master-fwq-积分抵扣现金

---
 phis-feign/src/main/java/com/hz/his/dto/report/GroupUserReportDto.java |    2 ++
 1 files changed, 2 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 31c7d99..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
@@ -22,6 +22,8 @@
     private List<String> groupIdList;
     /**鐢ㄦ埛鐘舵��*/
     private List<String> userStatusList;
+    /**鍝侀」鍚嶇О*/
+    private List<String> projectNameList;
     /**鎵ц鏁�*/
     private Integer deductionNum;
     /**寮�濮嬫椂闂�*/

--
Gitblit v1.8.0