From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 22 ++++++++++++++++++++++
1 files changed, 22 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..1b75670 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,24 @@
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 String employeeNo;
+
+
+ /**鏌ヨ绫诲瀷*/
+ private Integer type;
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
}
--
Gitblit v1.8.0