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

xiaoyong931011

2021-09-26 3e4cfdd9da5ed748292e7da7ec42a64d0fe4b75c

 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;