From ef212c321c6d833d69091e7491521f7d11984bfb Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 十月 2023 15:46:06 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq抽奖配置
---
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 10 ++++++++++
1 files changed, 10 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 d33f678..940b97c 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
@@ -14,6 +14,7 @@
private String employeeId;
/**闂ㄥ簵鏍囪瘑*/
private String shopId;
+ /**闂ㄥ簵鏍囪瘑闆嗗悎*/
private String shopIds;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String roleStr;
@@ -21,6 +22,10 @@
private List<String> employeeIdList;
/**闂ㄥ簵鏍囪瘑闆嗗悎*/
private List<String> shopIdList;
+ /**鐢ㄦ埛鐘舵��*/
+ List<String> userStatusList;
+ /**鏄惁鏌ヨVIP鐢ㄦ埛*/
+ Integer selectVip;
/**褰撳墠鏃堕棿*/
private String nowTime;
/**寮�濮嬫椂闂�*/
@@ -35,4 +40,9 @@
private Integer isBothOne;
/**宸ヤ綔鏃�*/
private Integer workDayNum;
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿鏁版嵁:0涓嶈繃婊�,1杩囨护*/
+ private Integer isFilterTestAccount;
}
--
Gitblit v1.8.0