From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
index 1368964..a682a4a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
@@ -19,6 +19,7 @@
 @Data
 public class EmployeeVo {
 
+    private String id;
     private String unionId;
 
     private String userId;

--
Gitblit v1.8.0