fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 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) {