Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

zhang

2025-07-15 641f7bb8b2d2e23f1f5192fecf030a567151c7b5

 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;
    }

}