From 64e2700126f64883aa982a11660c71e43a2a9f84 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 19 一月 2024 17:18:37 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index 10da103..75f6d2b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -10,16 +10,41 @@
* */
@Data
public class EmployeeReportDto {
+ /**鏍囪瘑*/
+ private String id;
/**鍛樺伐鏍囪瘑*/
private String employeeId;
+ /**闂ㄥ簵鏍囪瘑*/
+ private String shopId;
+ /**闂ㄥ簵鏍囪瘑闆嗗悎*/
+ private String shopIds;
+ /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
+ private String roleStr;
/**鍛樺伐鏍囪瘑闆嗗悎*/
private List<String> employeeIdList;
/**闂ㄥ簵鏍囪瘑闆嗗悎*/
private List<String> shopIdList;
+ /**鐢ㄦ埛鐘舵��*/
+ List<String> userStatusList;
+ /**鏄惁鏌ヨVIP鐢ㄦ埛*/
+ Integer selectVip;
/**褰撳墠鏃堕棿*/
private String nowTime;
/**寮�濮嬫椂闂�*/
private String startTime;
/**缁撴潫鏃堕棿*/
private String endTime;
+ /**绫诲瀷*/
+ private Integer type;
+ /**鏄惁鏂颁細鍛�*/
+ private Integer isNewUser;
+ /**鏄惁棣栧ぉ*/
+ private Integer isBothOne;
+ /**宸ヤ綔鏃�*/
+ private Integer workDayNum;
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿鏁版嵁:0涓嶈繃婊�,1杩囨护*/
+ private Integer isFilterTestAccount;
}
--
Gitblit v1.8.0