From 290e5fd2e74efe19326f56e38c3391aaae23ffc5 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期三, 24 十二月 2025 17:14:09 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/entity/BasStation.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasStation.java b/src/main/java/com/zy/asrs/entity/BasStation.java
index f2f4b9d..7d73f68 100644
--- a/src/main/java/com/zy/asrs/entity/BasStation.java
+++ b/src/main/java/com/zy/asrs/entity/BasStation.java
@@ -311,17 +311,17 @@
return null;
}
if (this.locSts.equals(LocStsType.LOC_STS_TYPE_O.type)) {
- return LocStsType.LOC_STS_TYPE_O.type + "." + LocStsType.LOC_STS_TYPE_O.desc;
+ return LocStsType.LOC_STS_TYPE_O.desc;
} else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_R.type)) {
- return LocStsType.LOC_STS_TYPE_R.type + "." + LocStsType.LOC_STS_TYPE_R.desc;
+ return LocStsType.LOC_STS_TYPE_R.desc;
} else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_S.type)) {
- return LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc;
+ return LocStsType.LOC_STS_TYPE_S.desc;
} else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_F.type)) {
- return LocStsType.LOC_STS_TYPE_F.type + "." + LocStsType.LOC_STS_TYPE_F.desc;
+ return LocStsType.LOC_STS_TYPE_F.desc;
} else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_X.type)) {
- return LocStsType.LOC_STS_TYPE_X.type + "." + LocStsType.LOC_STS_TYPE_X.desc;
+ return LocStsType.LOC_STS_TYPE_X.desc;
} else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_D.type)) {
- return LocStsType.LOC_STS_TYPE_D.type + "." + LocStsType.LOC_STS_TYPE_D.desc;
+ return LocStsType.LOC_STS_TYPE_D.desc;
}
return null;
}
--
Gitblit v1.9.1