From c501000155be318c8c56f06c60b764d42d14612b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 13 六月 2025 20:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
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 3103c4b..ffca642 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -310,14 +310,14 @@
}
public String getFrozen$() {
- if (null == this.frozen){ return null; }
+ if (null == this.frozen){ return "鏈喕缁�"; }
switch (this.frozen){
case 0:
return "鏈喕缁�";
case 1:
return "宸插喕缁�";
default:
- return null;
+ return "鏈喕缁�";
}
}
--
Gitblit v1.9.1