From bc798685f11aeec95e64c25b0a4594d8876d881d Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 02 八月 2024 14:25:12 +0800
Subject: [PATCH] Merge branch 'master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java | 6 +++++-
1 files changed, 5 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..04e5f53 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
@@ -10,6 +10,10 @@
* */
@Data
public class UserReportDto {
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
+
/**杩囨护娴嬭瘯璐﹀彿*/
private Integer isFilterTestAccount;
/**鍛樺伐鏍囪瘑*/
@@ -33,7 +37,7 @@
/**浼氬憳鐘舵��*/
private List<String> userStatusList;
/**澧為暱涓績鏄犲皠椤圭洰*/
- private List<String> upProjectIdList;
+ private List<String> upProjectNameList;
/**椤鹃棶鏍囪瘑*/
private List<String> adviserIdList;
/**鏍囩*/
--
Gitblit v1.8.0