From 96a3439306a4e7e3743f0d1c4b6253690f7fdf6c Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 06 七月 2023 12:19:25 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 7 +++++++
1 files changed, 7 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..b5515d1 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,11 @@
public class EmployeeReportDto {
/**鍛樺伐鏍囪瘑*/
private String employeeId;
+ /**闂ㄥ簵鏍囪瘑*/
+ private String shopId;
+ private String shopIds;
+ /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
+ private String roleStr;
/**鍛樺伐鏍囪瘑闆嗗悎*/
private List<String> employeeIdList;
/**闂ㄥ簵鏍囪瘑闆嗗悎*/
@@ -22,4 +27,6 @@
private String startTime;
/**缁撴潫鏃堕棿*/
private String endTime;
+ /**绫诲瀷*/
+ private Integer type;
}
--
Gitblit v1.8.0