From 6ada97d503bd93722c081b66a9adcce7599e5536 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 14 Apr 2021 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/vo/LogisticsImportVo.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/LogisticsImportVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/LogisticsImportVo.java
index f20f52e..5630c47 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/LogisticsImportVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/LogisticsImportVo.java
@@ -7,10 +7,14 @@
 @Data
 @ApiModel(value = "LogisticsImportVo", description = "信息返回类")
 public class LogisticsImportVo {
-    @ApiModelProperty(value = "单号")
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+    @ApiModelProperty(value = "快递公司编码")
+    private String logisticsCompanyCode;
+    @ApiModelProperty(value = "快递公司名称")
+    private String logisticsCompany;
+    @ApiModelProperty(value = "快递单号")
     private String waybillNo;
-    @ApiModelProperty(value = "备注")
-    private String remark;
-    @ApiModelProperty(value = "行数")
-    private int colNum;
+    @ApiModelProperty(value = "失败原因")
+    private String failReason;
 }

--
Gitblit v1.9.1