From 57994420ba7571a8c1ce8c12a1c610b0b2e09bcf Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 Aug 2020 12:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9screen=5F=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=A1=A8v3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/entity/screen/ScreenDifficultyDataEntity.java   | 4 ++++
 .../java/com/epmet/entity/screen/ScreenUserJoinEntity.java    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
index 27426e658c..845bbb7db0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
@@ -93,6 +93,10 @@ public class ScreenDifficultyDataEntity extends BaseEpmetEntity {
      */
 	private Integer eventReOrg;
 
+	/**
+	 * 事件被处理次数（08-21新增）
+	 */
+	private Integer eventHandledCount;
     /**
      * 事件类别编码
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java
index 6c054eba53..d67593a2f4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java
@@ -82,7 +82,7 @@ public class ScreenUserJoinEntity extends BaseEpmetEntity {
     /**
      * 总的参与次数较上月增长率(采集的时候后台自己计算)
      */
-	private String joinTotalUpRate;
+	private BigDecimal joinTotalUpRate;
 
     /**
      * 增长：incr；下降：decr； 相等 ：eq