Merge branch 'ty_fix' into score_shop

Helius

2021-11-19 402f3bbfb88548ac2952cd8de6dda68caf8871de

 zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java

@@ -173,7 +173,7 @@
    }

    public BigDecimal getConsumePay() {
        return consumePay;
        return consumePay.setScale(2, BigDecimal.ROUND_HALF_UP);
    }

    public void setConsumePay(BigDecimal consumePay) {