From 623afb6fbb8ce6adebf237e7b670d9f4f339184d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 01 五月 2024 00:11:14 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 8 ++++++++
1 files changed, 8 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 500b7d8..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,6 +10,8 @@
* */
@Data
public class EmployeeReportDto {
+ /**鏍囪瘑*/
+ private String id;
/**鍛樺伐鏍囪瘑*/
private String employeeId;
/**闂ㄥ簵鏍囪瘑*/
@@ -22,6 +24,10 @@
private List<String> employeeIdList;
/**闂ㄥ簵鏍囪瘑闆嗗悎*/
private List<String> shopIdList;
+ /**鐢ㄦ埛鐘舵��*/
+ List<String> userStatusList;
+ /**鏄惁鏌ヨVIP鐢ㄦ埛*/
+ Integer selectVip;
/**褰撳墠鏃堕棿*/
private String nowTime;
/**寮�濮嬫椂闂�*/
@@ -39,4 +45,6 @@
/**鎿嶄綔浜�*/
private String operatorId;
private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿鏁版嵁:0涓嶈繃婊�,1杩囨护*/
+ private Integer isFilterTestAccount;
}
--
Gitblit v1.8.0