From 14c2d7fc17595c86e7fe70f2d25f93a7d2c0a635 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 07 三月 2021 13:59:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java
index 517d502..30b1aad 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java
@@ -15,4 +15,6 @@
     private String age;
     private String archivesStatus;
     private String insuranceType;
+    private String basic;
+    private String empStatus;
 }

--
Gitblit v1.8.0