From 641f7bb8b2d2e23f1f5192fecf030a567151c7b5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 15 七月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 89b83ed..a97aa6a 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -417,14 +417,14 @@
}
public String getDanger$(){
- if (null == this.danger){ return null; }
+ if (null == this.danger){ return "寰呯Щ搴�"; }
switch (this.danger){
case 1:
- return "鏄�";
- case 0:
- return "鍚�";
+ return "绉诲簱涓�";
+ case 2:
+ return "绉诲簱瀹屾垚";
default:
- return String.valueOf(this.danger);
+ return "寰呯Щ搴�";
}
}
--
Gitblit v1.9.1