From c14ef66fa5e588f9b1a7424a5b4bc377762cc043 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期一, 25 十二月 2023 18:21:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new --- phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 8 ++++++++ 1 files changed, 8 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 bf2610d..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 @@ -23,4 +23,12 @@ private Integer isPerformanceEmp; /**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/ private List<String> roleList; + + + /**鏌ヨ绫诲瀷*/ + private Integer type; + /**寮�濮嬫椂闂�*/ + private String startTime; + /**缁撴潫鏃堕棿*/ + private String endTime; } -- Gitblit v1.8.0