From 046dc12bf491f186ec96450aa5331c25f6e0fe54 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期四, 16 十一月 2023 11:26:44 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
index f0aa39c..0f0a37c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.List;
+
/**
* @author fwq
* 鍛樺伐鎵╁睍
@@ -11,4 +13,22 @@
public class EmployeeDto extends PageDto {
/**淇敼鏃堕棿*/
private String updateTime;
+ /**鍛樺伐浼佷笟userId*/
+ private String userId;
+ /**瑙掕壊鍞竴瀛楃涓�*/
+ private String uniqueStr;
+ /**棰勭害闂ㄥ簵鏍囪瘑*/
+ private String shopId;
+ /**鏄惁涓氱哗鍛樺伐(0:鍚�,1:鏄�)*/
+ private Integer isPerformanceEmp;
+ /**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/
+ private List<String> roleList;
+
+
+ /**鏌ヨ绫诲瀷*/
+ private Integer type;
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
}
--
Gitblit v1.8.0