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/coin/service/impl/CoinServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
index 89de828..13f7a05 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
@@ -494,7 +494,7 @@
memberAccountMoneyChangeDao.insert(memberAccountRecord);
//添加资金划转历史记录
- memberAccountRecord.setContent("由合约"+symbol+"账户转入");
+ memberAccountRecord.setContent("合约"+symbol+"账户转入");
memberAccountRecord.setSymbol(walletCode);
memberAccountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);
memberAccountRecord.setAmount(balance);
@@ -965,7 +965,7 @@
memberAccountMoneyChangeDao.insert(memberAccountRecord);
//添加合约资金划转历史记录
- memberAccountRecord.setContent("由合约"+symbolOut+"账户转入至合约"+symbolIn+"账户");
+ memberAccountRecord.setContent("合约"+symbolOut+"账户转入至合约"+symbolIn+"账户");
memberAccountRecord.setAmount(balance);
memberAccountMoneyChangeDao.insert(memberAccountRecord);
--
Gitblit v1.9.1