From fc3a12040d6ec88f99c2a4cbe2afb16215ac5ae4 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期三, 13 十二月 2023 10:48:02 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 15760ea..bd3937d 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
@@ -33,7 +33,7 @@
     /**浼氬憳鐘舵��*/
     private List<String> userStatusList;
     /**澧為暱涓績鏄犲皠椤圭洰*/
-    private List<String> upProjectIdList;
+    private List<String> upProjectNameList;
     /**椤鹃棶鏍囪瘑*/
     private List<String> adviserIdList;
     /**鏍囩*/

--
Gitblit v1.8.0