From c0ad40fda3f99662380409c426eaecf16153096c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 09 四月 2024 11:06:41 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 16 ++++++++++++++++
1 files changed, 16 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 7bc4cb5..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
@@ -15,6 +15,22 @@
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