From 55a4f22db43ec34bc7f59103f4a94005bd613850 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 31 Mar 2021 15:40:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/activity' into activity

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