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-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java | 7 ++++++-
1 files changed, 6 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..f2d9ff0 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,15 @@
/**
* 请假类型
*/
- 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";
}
--
Gitblit v1.8.0