From 7e97ad28492c61a406ca2c21d471d3819093a12f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 12 四月 2024 08:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs

---
 src/main/java/com/zy/asrs/utils/RouteUtils.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index 6a11135..32f7b51 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -233,11 +233,11 @@
     }
 
     public static Short CrnStaEnd(Integer endSta,Integer souSta) {
-        if (souSta == 118){
-            return (short)119;
-        }
         switch (endSta) {
             case 100:
+                if (souSta == 118){
+                    return (short)119;
+                }
                 return (short)149;
             case 102:
             case 111:

--
Gitblit v1.9.1