Merge remote-tracking branch 'remotes/origin/feature/15_配送信息remark'

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -89,7 +89,10 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         requestDto.setExpressChannelName(request.getChannelName());
         requestDto.setExpressNo(request.getChannelDeliveryId());
         requestDto.setOrderSubState(deliveryStatus);
-        requestDto.setRemark("配送:"+request.getRemark());
+        if (StringUtils.isNotBlank(request.getRemark()))
+        {
+            requestDto.setRemark("配送:"+request.getRemark());
+        }
         OrderBaseResponse orderBaseResponseDto = orderCenterSdkService.updateDeliveryInfoById(requestDto);
         //订单服务修改配送单信息失败
         if (!SUCCESS_RESPONSE_CODE.equals(orderBaseResponseDto.getErrcode())) {