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

xiaoyong931011

2022-05-28 ca7809d5fcf86454118d41c88a3b9c238fe6b270

 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;