Merge branch 'master-fix' into dev

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -1924,7 +1924,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
             orderService.updateStatus(orderId, null, orderStatus, null, inWarehouseState, shipmentState, auditType, auditResult, businessTime, "出货操作", null);
         }
         // 卸柜/到仓操作时，不在此处更新动态
-        if (TO_WAREHOUSED.getStatus() != shipmentState) {
+        if (Objects.nonNull(shipmentState) && TO_WAREHOUSED.getStatus() != shipmentState) {
             this.shipmentAirOrderTimeLog(orderIdList, null, businessTime, shipmentState);
         }