Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 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;
}