From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 10 五月 2024 16:29:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 343b4ca..51a945b 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
@@ -11,8 +11,26 @@
//榛樿瑙掕壊
public static final Long DEFULT_ROLE = 1L;
- //A09鍑虹墖鐩爣浣嶇疆
- public static final String A09_OUT_TARGET_POSITION = "2001";
- //A09鍑虹墖鐩爣浣嶇疆
- public static final String A10_OUT_TARGET_POSITION = "2002";
+ /**
+ * 纾ㄨ竟娓呮礂鍓�
+ */
+ /**
+ * A09鍑虹墖鐩爣浣嶇疆2001
+ * A10鍑虹墖鐩爣浣嶇疆2002
+ */
+ public static final Integer A09_OUT_TARGET_POSITION = 2001;
+ public static final Integer A10_OUT_TARGET_POSITION = 2002;
+
+ /**
+ * 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
+ * 璇嗗埆鍚庢垚鍔熺姸鎬�100
+ * 鍑虹墖浠诲姟101
+ * 鎷胯蛋200
+ * 鐮存崯201
+ */
+ public static final Integer GLASS_STATE_IN = 100;
+ public static final Integer GLASS_STATE_OUT = 101;
+ public static final Integer GLASS_STATE_TAKE = 200;
+ public static final Integer A10_OUT_TARGET_DAMAGE = 201;
+
}
--
Gitblit v1.8.0