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/common/enumerates/MemberWalletCoinEnum.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java b/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
index e4d58dc..58a7210 100644
--- a/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
+++ b/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
@@ -14,9 +14,9 @@
 	CONTENTFROMWALLETCOIN("0002","由币币账户转入"),
 	
 	CONTENTTOWALLETCOIN("0003","转出至币币账户"),
-	CONTENTFROMCONTRACT("0004","由合约账户转入"),
+	CONTENTFROMCONTRACT("0004","合约账户转入"),
 	
-	CONTENTFROMAGENT("0005","由代理账户转入"),
+	CONTENTFROMAGENT("0005","代理账户转入"),
 	
 	WALLETCOINCODE("USDT", "USDT"),
 	

--
Gitblit v1.9.1