From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev

---
 service-community/src/main/java/com/java110/community/api/ActivitiesTypeApi.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/api/ActivitiesTypeApi.java b/service-community/src/main/java/com/java110/community/api/ActivitiesTypeApi.java
index ca8fed9..46cb400 100755
--- a/service-community/src/main/java/com/java110/community/api/ActivitiesTypeApi.java
+++ b/service-community/src/main/java/com/java110/community/api/ActivitiesTypeApi.java
@@ -109,6 +109,7 @@
         ActivitiesTypeDto activitiesTypeDto = new ActivitiesTypeDto();
         activitiesTypeDto.setPage(page);
         activitiesTypeDto.setRow(row);
+        activitiesTypeDto.setDefaultShow(defaultShow);
         activitiesTypeDto.setCommunityId(communityId);
         if(!StringUtil.isEmpty(defaultShow)){
             activitiesTypeDto.setDefaultShow(defaultShow);

--
Gitblit v1.8.0