From 7e0fe9378b0a4180d0bd1d74f6744285ebacdfdb Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期五, 11 七月 2025 12:48:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/srjtasrs' into srjtasrs

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

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlGift.java b/src/main/java/com/zy/asrs/entity/OrderDetlGift.java
index 86bef2b..ff583178 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlGift.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlGift.java
@@ -433,9 +433,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }

--
Gitblit v1.9.1