From e8cf4d70206fb9f4d09a4fc5a23aad2424e1369d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 27 五月 2025 23:35:06 +0800
Subject: [PATCH] 合格

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 09db67c..daf8067 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -67,7 +67,7 @@
     @ApiModelProperty(value= "鍗曚綅")
     private String unit;
 
-    @ApiModelProperty(value= "鍗曚环")
+    @ApiModelProperty(value= "鍗曚环 闀垮害")
     private Double price;
 
     @ApiModelProperty(value= "sku")
@@ -106,7 +106,7 @@
     @ApiModelProperty(value= "闀垮害")
     private Double length;
 
-    @ApiModelProperty(value= "浣撶Н")
+    @ApiModelProperty(value= "浣撶Н  姣涢噸")
     private Double volume;
 
     @ApiModelProperty(value= "涓夋柟缂栫爜")
@@ -216,9 +216,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);
         }
@@ -248,6 +250,6 @@
         if (!Cools.isEmpty(basBoxType)){
             return String.valueOf(basBoxType.getBoxSpecs());
         }
-        return null;
+        return this.brand;
     }
 }

--
Gitblit v1.9.1