Merge branch 'score_shop' into api_score_meger

jyy

2021-09-17 c5e6a16b70b5d119428fd621bfc2871a94c89d30

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