From a7a5c6df3617f879ed502be8a1895f4bf4be7559 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期四, 18 八月 2022 13:39:56 +0800
Subject: [PATCH] Revert "#"
---
src/main/java/com/zy/asrs/entity/LocMast.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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..1f3c032 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;
@@ -230,9 +230,9 @@
case 0:
return "鏈煡";
case 1:
- return "浣庡簱浣�";
+ return "娴嬭瘯搴撲綅";
case 2:
- return "楂樺簱浣�";
+ return "闈欑疆搴撲綅";
default:
return String.valueOf(this.locType1);
}
@@ -242,11 +242,19 @@
if (null == this.locType2){ return null; }
switch (this.locType2){
case 0:
- return "鏈煡";
+ return "鏃犺澶�";
case 1:
- return "绐勫簱浣�";
+ return "1鍙疯澶�";
case 2:
- return "瀹藉簱浣�";
+ return "2鍙疯澶�";
+ case 3:
+ return "3鍙疯澶�";
+ case 4:
+ return "4鍙疯澶�";
+ case 5:
+ return "5鍙疯澶�";
+ case 6:
+ return "6鍙疯澶�";
default:
return String.valueOf(this.locType2);
}
@@ -327,8 +335,10 @@
case 2:
return "娴嬭瘯涓�";
case 3:
- return "闈欑疆涓�";
+ return "娴嬭瘯瀹屾垚";
case 4:
+ return "闈欑疆涓�";
+ case 5:
return "闈欑疆瀹屾垚";
default:
return String.valueOf(this.packStatus);
--
Gitblit v1.9.1