Merge branch 'master-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -4414,7 +4414,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                         || Objects.equals(auditResult,order_update_pass.getDesc())
                         || Objects.equals(auditResult,order_update_reject.getDesc())
                         || Objects.equals(auditResult,order_update_cancel.getDesc()))
-                        && currentOrderDO.getShipmentState() > 0) ? OrderStatusEnum.valueOf(status).getNameZh().concat("-"): "").concat(I18nMessage.getZhMessage(auditResult));
+                        && currentOrderDO.getShipmentState() > 0) ? OrderStatusEnum.valueOf(currentOrderDO.getStatus()).getNameZh().concat("-"): "").concat(I18nMessage.getZhMessage(auditResult));
             }
             if (auditType == 0) {
                 this.checkOrderProcessingApprovalType(currentOrderDO, auditType, auditResult);