Merge branch 'ty_fix' into alpha

Helius

2021-11-12 b70d988c7600d179aba0fabb6adf0dc7c461cb8a

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