From e8b6e450ffbb6bfb9526df427ff1a53053906449 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 08 六月 2024 22:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ahyxasrs' into ahyxasrs
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 59300aa..cf70ea5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -392,7 +392,7 @@
if (!Cools.isEmpty(basBoxType)){
return String.valueOf(basBoxType.getBoxSpecs());
}
- return null;
+ return this.brand;
}
--
Gitblit v1.9.1