From b3024fd012fc39bc0cbe52a5775748df428fe5ee Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 12 三月 2021 09:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
index ec1d192..e03e10e 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
@@ -61,10 +61,20 @@
     /**
      * 请假类型
      */
-    public final static String LEAVETYPE = "LEAVETYPE";
+    public final static String LEAVE_TYPE = "LEAVETYPE";
 
     /**
      * 仲裁类型
      */
     public final static String ARBITRATIONTYPE = "ARBITRATIONTYPE";
+
+    /**
+     * 结案状态
+     */
+    public final static String  SETTLE_STATUS = "settleStatus";
+
+    /**
+     * 入离职类型
+     */
+    public final static String IN_OUT_TYPE = "LZTYPE";
 }

--
Gitblit v1.8.0