Merge branch 'hive2.0' of http://120.27.238.55:7000/r/beauty-erp into hive2.0

Helius

2021-03-17 24df3ed89ac1934bf0a0b9f74c4e5f227f0f82cf

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

@@ -275,7 +275,7 @@
    }

    public BigDecimal getPeopleCnt() {
        return peopleCnt;
        return peopleCnt == null ? BigDecimal.ZERO : peopleCnt.setScale(2, BigDecimal.ROUND_DOWN);
    }

    public void setPeopleCnt(BigDecimal peopleCnt) {