From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractEntrustVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractEntrustVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractEntrustVo.java
index 25d936e..4e49341 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractEntrustVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractEntrustVo.java
@@ -36,6 +36,6 @@
private int type;
public String getBondAmount() {
- return bondAmount.setScale(8, BigDecimal.ROUND_DOWN).toPlainString();
+ return bondAmount == null ? "" : bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
}
--
Gitblit v1.9.1