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

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

@@ -5790,7 +5790,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                         } else {
                             // 如果有异常则更新说明
                             OrderExceptionDO orderExceptionDO = pendHeavyExceptionList.get(0);
-                            orderExceptionDO.setOrderExceptionRemark(JSONObject.toJSONString(OrderExceptionDescVO.builder().descZh(descZh).descEn(descEn).build()));
+                            orderExceptionDO.setOrderExceptionRemark(JSONObject.toJSONString(OrderExceptionDescVO.builder().descZh(descZh).descEn(descEn).descFr(descFr).build()));
                             orderExceptionService.updateById(orderExceptionDO);
                         }
                         //更新订单为重货