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

pang.jiabao

2024-11-10 25fcfa12ceae7dac621b3a5ac671d515167cb23a

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

}