From 48c3fa5761f4eb5f7e134cce28a6d887156c34d1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Mar 2021 13:41:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/exchange-back

---
 src/main/java/com/xcong/excoin/modules/dataMonitoring/entity/DataMonitoringEntity.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/dataMonitoring/entity/DataMonitoringEntity.java b/src/main/java/com/xcong/excoin/modules/dataMonitoring/entity/DataMonitoringEntity.java
index 4b0a162..382fbde 100644
--- a/src/main/java/com/xcong/excoin/modules/dataMonitoring/entity/DataMonitoringEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/dataMonitoring/entity/DataMonitoringEntity.java
@@ -8,6 +8,8 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.xcong.excoin.common.utils.BigDecimalSerialize;
 
 import lombok.Data;
 
@@ -41,6 +43,7 @@
     /**
      * 总盈亏
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal reward;
     /**
      *不符合条件的订单数量
@@ -60,5 +63,20 @@
     
     @TableField(exist = false)
     private String orderType;
+    /**
+	 * 账号类型
+	 */
+	@TableField(exist = false)
+	private int accountType;
+	/**
+	 * 查询条件:账号类型
+	 */
+	@TableField(exist = false)
+    private String isTest;
+	/**
+     * 姓名
+     */
+	@TableField(exist = false)
+    private String realName;
 
 }

--
Gitblit v1.9.1