Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

wuxw

2022-04-22 0a9b6e565843bd25e5ef37e979c7da9bbf3df218

 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);