From 8ccd54f9478ab1b1248d4e000b698512c65c7563 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 29 九月 2022 10:36:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzynwcs' into gzynwcs
---
src/main/java/com/zy/asrs/entity/LocMast.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 33aa00c..2a220ef 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -312,8 +312,10 @@
case 2:
return "娴嬭瘯涓�";
case 3:
- return "闈欑疆涓�";
+ return "娴嬭瘯瀹屾垚";
case 4:
+ return "闈欑疆涓�";
+ case 5:
return "闈欑疆瀹屾垚";
default:
return String.valueOf(this.packStatus);
--
Gitblit v1.9.1