From a24e40cd804c85674b8d06941e1f4e5379ecd970 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 28 十一月 2023 14:55:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-充值补送增值金' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 10 ++++++++++
1 files changed, 10 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 b96afca..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
@@ -19,6 +19,16 @@
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