From 0730d0e9b5714394241cb3a19f3be38a40c46f7c Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 11 Nov 2020 16:40:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/roc-bak' into roc-bak

---
 src/main/java/com/xcong/excoin/modules/dataMonitoring/entity/DataMonitoringEntity.java |   15 +++++++++++++++
 1 files changed, 15 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..64d1b18 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
@@ -60,5 +60,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