From 38fdaefefbfb7fdfc0609db817978082d92f50b9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Aug 2020 11:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9screen=5Fparty=5Fbranch=5Fdat?=
 =?UTF-8?q?a=E8=A1=A8=EF=BC=8C=E6=96=B0=E5=A2=9EaverageJoinUserCount?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9meetCategoryId=EF=BC=88issueCategory?=
 =?UTF-8?q?Id=EF=BC=89,meetCategoryName(issueCategoryName)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenPartyBranchDataEntity.java       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
index 95420d51a7..cdd5c6ef0e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
@@ -26,7 +26,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 基层党建-建设情况数据（支部，联建）
+ * 基层党建-建设情况数据（支部，联建,志愿服务）
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-08-18
@@ -79,14 +79,14 @@ public class ScreenPartyBranchDataEntity extends BaseEpmetEntity {
 	private String orgName;
 
     /**
-     * 议题分类Id
+     * 会议分类Id
      */
-	private String issueCategoryId;
+	private String meetCategoryId;
 
     /**
-     * 议题分类名称
+     * 会议分类名称
      */
-	private String issueCategoryName;
+	private String meetCategoryName;
 
     /**
      * 组织次数
@@ -98,4 +98,9 @@ public class ScreenPartyBranchDataEntity extends BaseEpmetEntity {
      */
 	private Integer joinUserCount;
 
+	/**
+	 * 平均参加人数
+	 */
+	private Integer averageJoinUserCount;
+
 }