From 1918c5fe8c390ca90acff60b71e27257d65fb463 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 24 一月 2022 10:21:54 +0800
Subject: [PATCH] Merge branch 'sxjzasrs' of http://47.97.1.152:5880/r/zy-asrs into sxjzasrs0

---
 src/main/java/com/zy/asrs/entity/LocMast.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..4a9a651 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -215,9 +215,9 @@
             case 0:
                 return "鏈煡";
             case 1:
-                return "浣庡簱浣�";
+                return "杞诲簱浣�";
             case 2:
-                return "楂樺簱浣�";
+                return "閲嶅簱浣�";
             default:
                 return String.valueOf(this.locType1);
         }

--
Gitblit v1.9.1