Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!937

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -185,9 +185,10 @@ public class UserDeliverOrderController extends BaseApiController {
         }
         deliverOrderVO.setItems(userDeliverOrderItemVOS);
 
-
-        deliverOrderVO.setDeliverList(
-            userDeliverOrderItemService.getDeliverItemList(order.getOrderId(), deliverOrderVO.getItems()));
+        if (!DeliverOrderTypeEnum.CARD.getValue().equals(deliverOrder.getType())) {
+            deliverOrderVO.setDeliverList(
+                userDeliverOrderItemService.getDeliverItemList(order.getOrderId(), deliverOrderVO.getItems()));
+        }
         return AjaxResult.success(deliverOrderVO);
     }