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

java110

2021-09-04 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8

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