From ac61bdd7a7f4834d35bf42a06bc766981f50211e Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 29 Jan 2021 20:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java
index a6a05e7..a2abe3a 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java
+++ b/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) {
--
Gitblit v1.9.1