From 503c45f8fd117ca58d56dcaceb44d8f95b3e2527 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 16 八月 2024 12:19:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 1 +
1 files changed, 1 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 e75e9cf..47b4769 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
@@ -52,6 +52,7 @@
public static final Integer GLASS_STATE_SCHEDULE_ING = 104;
public static final Integer GLASS_STATE_DAMAGE = 8;
public static final Integer GLASS_STATE_TAKE = 9;
+ public static final List<Integer> GLASS_STATE_DAMAGE_TAKE = Arrays.asList(8, 9);
public static final List<Integer> GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103, 104);
public static final List<Integer> GLASS_STATE_IN_ALL_ZERO = Arrays.asList(0, 100, 102, 103, 104);
--
Gitblit v1.8.0