From a2d9bd16ac1106489572a5f7d8d70e1086d5406d Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 31 May 2020 21:19:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinAddressEntity.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinAddressEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinAddressEntity.java
index e863787..80dd3ec 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinAddressEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinAddressEntity.java
@@ -27,7 +27,7 @@
     /**
      * 私钥
      */
-    private String private_key;
+    private String privateKey;
     /**
      * 币种
      */
@@ -35,7 +35,7 @@
     /**
      * 是否是本平台地址1:是  0:否
      */
-    private String is_biyict;
+    private String isBiyict;
     public static final String IS_BIYICT_YES = "1";
     public static final String IS_BIYICT_NO = "0";
     /**
@@ -49,7 +49,7 @@
     /**
      * 币种ID
      */
-    private Long symbolscoin_id;
+    private Long symbolscoinId;
     
 
 }

--
Gitblit v1.9.1