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

Helius

2022-05-19 46950524044428ed3a53b9776aa01cb1a08a51ca

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

@@ -64,6 +64,9 @@
    private Long remainTime;

    public Integer getPayMethodType() {
        if (this.payMethod == null) {
            return 0;
        }
        switch (this.payMethod) {
            case "微信支付" :
                return 1;