Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-31 a27c45a501d059bca456bac7b561786232d3ecf3

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

@@ -122,7 +122,7 @@
    }

    public BigDecimal getPeopleNum() {
        return peopleNum;
        return peopleNum == null ? peopleNum : peopleNum.setScale(2, BigDecimal.ROUND_DOWN);
    }

    public void setPeopleNum(BigDecimal peopleNum) {