Merge branch 'api' into hive2.0

jyy

2021-01-25 b265b9fc41cd9de5bd36c76ec02578e1075de1d1

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