From 2adc60ff9912923be2b59242dda1a77851dd8b5c Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 28 八月 2023 11:06:33 +0800
Subject: [PATCH] Merge branch 'rx-0814-开单项目' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 17 +++++++++++++++++
1 files changed, 17 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..500b7d8 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
@@ -12,6 +12,12 @@
public class EmployeeReportDto {
/**鍛樺伐鏍囪瘑*/
private String employeeId;
+ /**闂ㄥ簵鏍囪瘑*/
+ private String shopId;
+ /**闂ㄥ簵鏍囪瘑闆嗗悎*/
+ private String shopIds;
+ /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
+ private String roleStr;
/**鍛樺伐鏍囪瘑闆嗗悎*/
private List<String> employeeIdList;
/**闂ㄥ簵鏍囪瘑闆嗗悎*/
@@ -22,4 +28,15 @@
private String startTime;
/**缁撴潫鏃堕棿*/
private String endTime;
+ /**绫诲瀷*/
+ private Integer type;
+ /**鏄惁鏂颁細鍛�*/
+ private Integer isNewUser;
+ /**鏄惁棣栧ぉ*/
+ private Integer isBothOne;
+ /**宸ヤ綔鏃�*/
+ private Integer workDayNum;
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
}
--
Gitblit v1.8.0