Merge branch 'score_shop' into api_score_meger

jyy

2021-09-11 e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9

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