From 8f6ebf95e57c6f39ec11002de79bf6ed16844a5c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 30 八月 2025 10:44:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
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