From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 11 六月 2025 10:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java b/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
index b53209e..a258837 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
@@ -598,6 +598,11 @@
String DICT_MDC_STAFF_TEAM = "mdc_staff_team";
/**
+ * 椹卞姩鍙傛暟鍗曚綅瀛楀吀缂栧彿
+ */
+ String DICT_EQUIPMENT_RUN_UNIT = "equipment_run_unit";
+
+ /**
* 鍔犵彮鏁版嵁 鑷姩璁＄畻鏍囪瘑 1(鏄�) 2(鍚�)
*/
Integer AUTO_FLAG_Y = 1;
@@ -612,7 +617,13 @@
*/
String CLOSE_TYPE_0 = "0";
String CLOSE_TYPE_1 = "1";
+ /**
+ * 浜х嚎绫诲瀷 1涓�绾ч儴闂� 2瀛愰儴闂� 3瀛愰儴闂�
+ */
+ String ORG_TYPE_2 = "2";
+ String ORG_TYPE_3 = "3";
- String ORG_TYPE = "3";
+ Integer SHIFT_TYPE_1 = 1;
+ Integer SHIFT_TYPE_2 = 2;
}
--
Gitblit v1.9.3