From 9a6a85eecf1dd8489de45eb3ab804d3e33605be2 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 18 八月 2022 09:22:19 +0800
Subject: [PATCH] Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs
---
src/main/java/com/zy/asrs/entity/LocMast.java | 6 ++++--
1 files changed, 4 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 51bfdb0..28c709e 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -186,7 +186,7 @@
@TableField("fire_status")
private Integer fireStatus;
-// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.闈欑疆涓�;4:闈欑疆瀹屾垚}
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.闈欑疆涓�;5:闈欑疆瀹屾垚}
@ApiModelProperty(value= "")
@TableField("pack_status")
private Integer packStatus;
@@ -327,8 +327,10 @@
case 2:
return "娴嬭瘯涓�";
case 3:
- return "闈欑疆涓�";
+ return "娴嬭瘯瀹屾垚";
case 4:
+ return "闈欑疆涓�";
+ case 5:
return "闈欑疆瀹屾垚";
default:
return String.valueOf(this.packStatus);
--
Gitblit v1.9.1