From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs

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

diff --git a/src/main/java/com/zy/asrs/entity/TestMast.java b/src/main/java/com/zy/asrs/entity/TestMast.java
index a5daaad..664e348 100644
--- a/src/main/java/com/zy/asrs/entity/TestMast.java
+++ b/src/main/java/com/zy/asrs/entity/TestMast.java
@@ -103,7 +103,7 @@
             case 0:
                 return "鏆傚仠";
             case 1:
-                return "鐢宠涓�";
+                return "寰呮祴";
             case 2:
                 return "澶嶆牳涓�";
             case 3:

--
Gitblit v1.9.1