From 25fcfa12ceae7dac621b3a5ac671d515167cb23a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 10 十一月 2024 10:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index d595ef3..5c09f47 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -231,7 +231,7 @@
if (!Cools.isEmpty(basBoxType)){
return String.valueOf(basBoxType.getBoxSpecs());
}
- return null;
+ return this.brand;
}
}
--
Gitblit v1.9.1