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

Helius

2021-09-27 0a54c5df5c1a1f77570a07ff008ed90ff9d17da4

 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;