From 0f0a66dbd463f239c128cacc82e87b046257d4e0 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 30 九月 2024 16:50:42 +0800
Subject: [PATCH] 1.修改到访和撤回逻辑 2.会员来访明细查询修改

---
 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java |   12 ++++++++++++
 1 files changed, 12 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..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,10 +10,13 @@
  * */
 @Data
 public class EmployeeReportDto {
+    /**鏍囪瘑*/
+    private String id;
     /**鍛樺伐鏍囪瘑*/
     private String employeeId;
     /**闂ㄥ簵鏍囪瘑*/
     private String shopId;
+    /**闂ㄥ簵鏍囪瘑闆嗗悎*/
     private String shopIds;
     /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
     private String roleStr;
@@ -21,6 +24,10 @@
     private List<String> employeeIdList;
     /**闂ㄥ簵鏍囪瘑闆嗗悎*/
     private List<String> shopIdList;
+    /**鐢ㄦ埛鐘舵��*/
+    List<String> userStatusList;
+    /**鏄惁鏌ヨVIP鐢ㄦ埛*/
+    Integer selectVip;
     /**褰撳墠鏃堕棿*/
     private String nowTime;
     /**寮�濮嬫椂闂�*/
@@ -35,4 +42,9 @@
     private Integer isBothOne;
     /**宸ヤ綔鏃�*/
     private Integer workDayNum;
+    /**鎿嶄綔浜�*/
+    private String operatorId;
+    private String operatorName;
+    /**鏄惁杩囨护娴嬭瘯璐﹀彿鏁版嵁:0涓嶈繃婊�,1杩囨护*/
+    private Integer isFilterTestAccount;
 }

--
Gitblit v1.8.0