From 250e2cd3c6b63605d2d23d496884ff18fac5e536 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 23 十二月 2024 17:15:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
index 7efbd7d..ea0cda4 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -84,6 +84,7 @@
public static final Integer GLASS_CACHE_TYPE_FINISH = 5;
public static final Integer GLASS_CACHE_TYPE_OTHER = 6;
public static final List<Integer> GLASS_CACHE_TYPE_OUT_ALL = Arrays.asList(2, 3);
+ public static final List<Integer> GLASS_CACHE_TYPE_IN_ALL = Arrays.asList(1, 3);
/**
* 纾ㄨ竟浠诲姟鐜荤拑鐘舵��
@@ -289,4 +290,14 @@
public static final Integer HOLLOW_FLOW_CARD_PAUSE = 2;
public static final Integer HOLLOW_FLOW_CARD_SUCCESS = 3;
+ /**
+ * 涓┖澶х悊鐗囩鍑虹墖鐘舵�両
+ * 0 鏈繘绗�
+ * 1 鍗犵敤
+ * 2 杩涚瀹屾垚
+ */
+ public static final Integer HOLLOW_RELATION_NEW = 0;
+ public static final Integer HOLLOW_RELATION_OCCUPY = 1;
+ public static final Integer HOLLOW_RELATION_SUCCESS = 2;
+
}
--
Gitblit v1.8.0