From 98fb96938258c6b966e007259860c9cdc8d5e2f2 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 05 二月 2024 16:26:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index 940b97c..75f6d2b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -10,6 +10,8 @@
  * */
 @Data
 public class EmployeeReportDto {
+    /**鏍囪瘑*/
+    private String id;
     /**鍛樺伐鏍囪瘑*/
     private String employeeId;
     /**闂ㄥ簵鏍囪瘑*/

--
Gitblit v1.8.0