Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

Helius

2022-05-28 b62edba94cc796bf3aecc893ae3a290a02317e14

 src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java

@@ -63,6 +63,9 @@
    @ApiModelProperty(value = "剩余时间")
    private Long remainTime;

    @ApiModelProperty(value = "运费")
    private BigDecimal carriage;

    public Integer getPayMethodType() {
        if (this.payMethod == null) {
            return 0;