From 2028b51aeda2b6b23fda4183875b145d5e83822f Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 19 六月 2024 11:06:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index b004505..67ea7ab 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -18,11 +18,11 @@
}};
public static final List<Integer> MERGE_STA_NO_TWO = new ArrayList<Integer>() {{
- add(100);add(101);
+// add(100);add(101);
}};
public static final List<Integer> MERGE_STA_NO_THREE = new ArrayList<Integer>() {{
- add(106);add(107);
+// add(106);add(107);
}};
public static final List<Integer> MERGE_STA_NO_FOUR = new ArrayList<Integer>() {{
--
Gitblit v1.9.1