From 2cfc759f968777aaddf48fab61d63b40738d7e4a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 18 六月 2025 10:50:49 +0800
Subject: [PATCH] Merge branch 'S7_master' of http://10.153.19.25:10105/r/YiWuProject into S7_master

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java |    8 ++++----
 1 files changed, 4 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 419a29e..6d0a7cb 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
@@ -36,10 +36,10 @@
      * 蹇欑 1
      * 绂佺敤 2
      */
-    public static final String OUT_FREE = "0";
-    public static final String OUT_BUSY = "1";
-    public static final String OUT_DISABLE = "2";
-    public static final List<String> OUT_DISABLE_ALL = Arrays.asList("1", "2");
+    public static final Integer OUT_FREE = 0;
+    public static final Integer OUT_BUSY = 1;
+    public static final Integer OUT_DISABLE = 2;
+    public static final List<Integer> OUT_DISABLE_ALL = Arrays.asList(1, 2);
 
 
     /**

--
Gitblit v1.8.0