java/zhihuishenqu.git

			@@ -2,10 +2,20 @@

			import java.util.List;

			import com.panzhihua.common.model.dtos.PageBaseDTO;
			import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
			import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
			import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
			import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
			import com.panzhihua.common.model.dtos.community.acid.*;
			import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
			import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
			import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
			import com.panzhihua.common.model.dtos.community.enterprise.*;
			import com.panzhihua.common.model.dtos.community.reserve.*;
			import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
			import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
			import com.panzhihua.common.model.dtos.community.*;
			import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
			import com.panzhihua.common.model.dtos.community.cluster.admin.*;
			import com.panzhihua.common.model.dtos.property.CommonPage;
			import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
			import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
			@@ -14,11 +24,19 @@
			import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
			import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
			import com.panzhihua.common.model.dtos.neighbor.*;
			import com.panzhihua.common.model.vos.community.*;
			import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
			import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
			import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
			import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
			import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
			import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
			import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
			import io.swagger.annotations.ApiOperation;
			import com.panzhihua.common.model.vos.community.*;
			import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
			import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
			import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
			import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
			import org.springframework.cloud.openfeign.FeignClient;
			import org.springframework.scheduling.annotation.Async;
			import org.springframework.web.bind.annotation.DeleteMapping;
			import org.springframework.web.bind.annotation.GetMapping;
			import org.springframework.web.bind.annotation.PathVariable;
			@@ -31,6 +49,22 @@
			import com.panzhihua.common.model.dtos.PageDTO;
			import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
			import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
			import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerAddDTO;
			import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerDeleteDTO;
			import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerEditDTO;
			import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
			import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO;
			import com.panzhihua.common.model.dtos.common.AddComMngVolunteerOrgTeamDto;
			import com.panzhihua.common.model.dtos.common.AddComMngVolunteerServiceTypeDto;
			import com.panzhihua.common.model.dtos.common.AddComMngVolunteerSkillDto;
			import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
			import com.panzhihua.common.model.dtos.common.EditComMngVolunteerOrgTeamDto;
			import com.panzhihua.common.model.dtos.common.EditComMngVolunteerServiceTypeDto;
			import com.panzhihua.common.model.dtos.common.EditComMngVolunteerSkillDto;
			import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
			import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
			import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
			import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
			import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
			import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
			import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
			@@ -52,9 +86,12 @@
			import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
			import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
			import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
			import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
			import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO;
			import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
			import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
			import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
			import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
			import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
			import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
			import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
			@@ -76,7 +113,6 @@
			import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
			import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
			import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
			import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
			import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
			import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
			import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
			@@ -96,6 +132,7 @@
			import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
			import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
			import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
			import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
			import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
			import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
			import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
			@@ -116,6 +153,19 @@
			import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
			import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingHouseDto;
			import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingUnitDto;
			import com.panzhihua.common.model.dtos.community.building.admin.DeleteBuildingHousePopulationDto;
			import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingHouseDto;
			import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingUnitDto;
			import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingListDto;
			import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingUnitHouseListDto;
			import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterAdminDto;
			import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto;
			import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterAdminDto;
			import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto;
			import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto;
			import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto;
			import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO;
			import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO;
			@@ -132,24 +182,64 @@
			import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
			import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
			import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
			import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
			import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
			import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
			import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
			import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
			import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
			import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
			import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
			import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
			import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
			import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
			import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
			import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
			import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
			import com.panzhihua.common.model.dtos.community.fms.AddTeamMemberDTO;
			import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
			import com.panzhihua.common.model.dtos.community.fms.ApplyFmsServiceDTO;
			import com.panzhihua.common.model.dtos.community.fms.ApprovalFmsServiceAdminDTO;
			import com.panzhihua.common.model.dtos.community.fms.DeleteTeamMemberDTO;
			import com.panzhihua.common.model.dtos.community.fms.EditFmsClassroomAdminDTO;
			import com.panzhihua.common.model.dtos.community.fms.EditTeamDTO;
			import com.panzhihua.common.model.dtos.community.fms.EditTeamMemberDTO;
			import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
			import com.panzhihua.common.model.dtos.community.fms.EvaluationFmsServiceDTO;
			import com.panzhihua.common.model.dtos.community.fms.FeedbackFmsServiceDTO;
			import com.panzhihua.common.model.dtos.community.fms.PageFmsClassroomAdminDTO;
			import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
			import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAdminDTO;
			import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
			import com.panzhihua.common.model.dtos.community.fms.PageFmsTeamDTO;
			import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
			import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
			import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
			import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
			import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
			import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageJoinGameListDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageVerifyRecordDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.PutUserInfoDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
			import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO;
			import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
			import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
			import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
			import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHousesConfigDTO;
			import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
			import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
			import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
			import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
			import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
			import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
			@@ -162,12 +252,21 @@
			import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
			import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
			import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
			import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
			import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
			import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
			import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
			import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
			import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
			import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
			import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
			import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
			import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
			import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
			import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
			import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
			import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
			import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
			import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
			import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
			import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
			@@ -200,7 +299,6 @@
			import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
			import com.panzhihua.common.model.dtos.property.CommonPage;
			import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
			@@ -230,17 +328,99 @@
			import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
			import com.panzhihua.common.model.vos.BcDictionaryItemVO;
			import com.panzhihua.common.model.vos.BcDictionaryVO;
			import com.panzhihua.common.model.vos.ComActSocialMemberVO;
			import com.panzhihua.common.model.vos.DictionaryVO;
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
			import com.panzhihua.common.model.vos.community.ActivitySignVO;
			import com.panzhihua.common.model.vos.community.BatchhouseVO;
			import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
			import com.panzhihua.common.model.vos.community.ComActActRegistVO;
			import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
			import com.panzhihua.common.model.vos.community.ComActActivityVO;
			import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
			import com.panzhihua.common.model.vos.community.ComActColumnVO;
			import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
			import com.panzhihua.common.model.vos.community.ComActDynVO;
			import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
			import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
			import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
			import com.panzhihua.common.model.vos.community.ComActMessageVO;
			import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
			import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
			import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
			import com.panzhihua.common.model.vos.community.ComActVO;
			import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
			import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
			import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
			import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
			import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
			import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
			import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationCultExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationElderExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationPensionExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
			import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
			import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
			import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
			import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
			import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
			import com.panzhihua.common.model.vos.community.ComMngVillageVO;
			import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
			import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
			import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
			import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO;
			import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO;
			import com.panzhihua.common.model.vos.community.ComPropertyVO;
			import com.panzhihua.common.model.vos.community.ComStreetVO;
			import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
			import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
			import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
			import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
			import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
			import com.panzhihua.common.model.vos.community.SignactivityVO;
			import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
			import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
			import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
			import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
			import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
			import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
			import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
			import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
			import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
			import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
			import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
			import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
			import com.panzhihua.common.model.vos.community.rentHouse.RentingHourseOrderVO;
			import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
			import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
			import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
			import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
			import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
			import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
			import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
			import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
			import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
			import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
			import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
			import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
			import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
			import com.panzhihua.common.model.vos.community.warehouse.WarehouseDonatesExcelVO;
			import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
			import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
			import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
			@@ -257,7 +437,7 @@
			* @author: huang.hongfa weixin hhf9596 qq 959656820
			* @create: 2020-12-07 15:59
			**/
			@FeignClient(name = "community")
			@FeignClient(name = "huacheng-community")
			public interface CommunityService {
			/**
			* 新增社区活动
			@@ -831,7 +1011,7 @@
			* @return 类型列表
			*/
			@PostMapping("listbuildtype")
			R listBuildType();
			R listBuildType(@RequestParam("communityId")Long communityId);

			/**
			* 分页查询其他建筑
			@@ -990,10 +1170,11 @@
			*
			* @param userId
			* 用户id
			* @param status
			* @return 活动列表
			*/
			@PostMapping("listactivity")
			R listActivity(@RequestParam("userId") Long userId);
			R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type",required = false)Integer type);

			/**
			* 用户确认心愿
			@@ -1089,7 +1270,7 @@
			* @return 社区集合按照创建顺序倒序排列
			*/
			@PostMapping("listcommunityall")
			R listCommunityAll();
			R listCommunityAll(@RequestParam("areaCode")String areaCode);

			/**
			* 首页广告banner
			@@ -1456,12 +1637,12 @@
			/**
			* 议事投票-投票
			*
			* @param comActDiscussOptionUserDTO
			* @param discussVoteOptionDTO
			* 投票信息
			* @return 投票结果
			*/
			@PostMapping("adddiscussoptionuser")
			R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
			R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO);

			/**
			* 议事投票-评论-点赞、取消点赞
			@@ -2096,10 +2277,11 @@
			*
			* @param provinceAdcode
			* 省份code
			* @param areaCode
			* @return 查询结果
			*/
			@GetMapping("/common/data/area/all")
			R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
			R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);

			/**
			* 分页查询街道
			@@ -2421,6 +2603,23 @@
			R pagePopulation(ComMngPopulationDTO comMngPopulationVO);

			/**
			* 导出老人
			*
			* @param comMngPopulationVO
			* 查询参数
			* @return 分页集合
			*/
			@PostMapping("/common/data/population/exportOld")
			R exportOld(ComMngPopulationDTO comMngPopulationVO);


			/**
			* 根据身份证查询实有人口信息
			*/
			@GetMapping("/common/data/population/selectByIdCard")
			R selectByIdCard(@RequestParam("idCard") String idCard);

			/**
			* 根据id实有人口详细信息
			*
			* @param populationId
			@@ -2453,12 +2652,12 @@
			/**
			* 批量删除实有人口
			*
			* @param Ids
			* @param ids
			* 实有人口id集合
			* @return 删除结果
			*/
			@PostMapping("/common/data/population/delete")
			R deletePopulations(@RequestBody List<Long> Ids);
			R deletePopulations(@RequestBody List<Long> ids,@RequestParam("communityId") Long communityId);

			/**
			* 根据社区id查询所有实有人口
			@@ -3241,7 +3440,7 @@
			* @date 2021/8/31 15:03
			*/
			@GetMapping("/workGuide/classify/getList")
			R getWorkGuideClassifyList();
			R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode);

			/**
			* 分页查询邻里圈
			@@ -3564,6 +3763,16 @@
			R deleteHouses(@RequestBody List<Long> Ids);

			/**
			* 新增实有房屋信息
			*
			* @param houseEditAdminDTO
			* 请求参数
			* @return 编辑结果
			*/
			@PostMapping("/common/data/population/house/insert")
			R insertHouse(@RequestBody ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO);

			/**
			* 实有房屋统计
			*
			* @param communityId
			@@ -3747,6 +3956,15 @@
			*/
			@PostMapping("/elders/authRecords/statistic/export")
			R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO);

			/**
			* 导出高龄认证记录 exportElderAuthRecords 导出高龄认证记录
			* @param pageElderAuthRecordsDTO 查询参数
			* @return R 查询结果
			* @date 2021/9/02 11:03
			*/
			@PostMapping("/elders/authRecords/export")
			R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);

			/**
			* 分页查询养老金人员认证记录 pagePensionAuthRecords 分页查询养老金人员认证记录
			@@ -4814,12 +5032,19 @@
			/**
			* 小程序查询邻里圈话题列表
			*
			* @param communityId
			* 社区id
			* @return 邻里圈话题列表
			*/
			@GetMapping("/neighbor/getNeighborTopicByApp")
			R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);
			R getNeighborTopicByApp(@RequestParam("name") String name);

			/**
			* 删除话题
			* @param id
			* @return
			*/
			@GetMapping("/neighbor/deleteNeighborTopic")
			R deleteNeighborTopic(@RequestParam("id") Long id);

			/**
			* 综治后台-查询社区列表
			@@ -4828,6 +5053,22 @@
			*/
			@GetMapping("/eventgrid/community/list")
			R getCommunityLists();

			/**
			* 查询西区社区列表
			*
			* @return 社区列表
			*/
			@GetMapping("/eventgrid/community/westList")
			R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode);

			/**
			* 综治app-小区列表
			* @param villageListAppDTO 请求参数
			* @return 小区列表
			*/
			@PostMapping("/village/grid/list/app")
			R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);

			/**
			* 分页查询退役军人列表
			@@ -5112,14 +5353,23 @@
			R getIntegralReceiveApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

			/**
			* 小程序-查询用户积分列表
			* 小程序-积分统计
			*
			* @param userId
			* 用户id
			* @return 用户积分列表
			*/
			@PostMapping("/integral/user/list/applets")
			R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
			@GetMapping("/integral/user/statistics")
			R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam(value = "communityId", required = false) Long communityId);

			/**
			* 查询我的积分余额
			* @param userId
			* @param communityId
			* @return
			*/
			@GetMapping("/integral/user/balance")
			R getUserIntegralBalance(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

			/**
			* 小程序-查询社区积分账户排行榜
			@@ -5182,11 +5432,11 @@
			R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);

			/**
			* 根据社区活动id查询社区活动报名人员列表
			* 根据社区活动id查询社区活动报名且未参与人员列表
			*
			* @param activityId
			* 活动id
			* @return 社区活动报名人员列表
			* @return 社区活动报名且未参与人员列表
			*/
			@PostMapping("/integral/act/activity/admin")
			R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
			@@ -5237,7 +5487,7 @@
			* @return 查询结果
			*/
			@GetMapping("/patrolRecord/rota/getRotaPersonByDate")
			R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate);
			R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

			/**
			* 根据日期查询值班领导
			@@ -5245,7 +5495,7 @@
			* @return 查询结果
			*/
			@GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
			R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);
			R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

			/**
			* 批量导入值班表
			@@ -5274,7 +5524,7 @@
			* @return 社区列表
			*/
			@GetMapping("/switch/community/all/list")
			R communitySwitchList();
			R communitySwitchList(@RequestParam("appId") String appId);

			/**
			* 根据名字查询所有社区列表
			@@ -5284,7 +5534,7 @@
			* @return 社区列表
			*/
			@GetMapping("/switch/community/search/list")
			R communitySwitchSearchList(@RequestParam(value = "name") String name);
			R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "appId") String appId);

			/**
			* 根据经纬度以及距离搜索附近社区列表
			@@ -5382,7 +5632,7 @@
			* @return 随手拍分类列表
			*/
			@GetMapping("/classify/admin/list")
			R listPhotoClassify();
			R listPhotoClassify(@RequestParam("areaCode") String areaCode);

			/**
			* 社区后台-切换随手拍公示状态
			@@ -5410,6 +5660,11 @@
			@PostMapping("/reserve/commit")
			R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO);

			@PostMapping("/reserve/commitNoToken")
			R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);

			@PostMapping("/reserve/homeQuarantine/commitNoToken")
			R homeQuarantineCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
			/**
			* 我的预约/登记
			* @param pageUserReserveDTO
			@@ -5476,7 +5731,7 @@
			* @return 预约登记详情
			*/
			@GetMapping("/reserve/admin/detail")
			R detailReserveAdmin(@RequestParam("reserveId") Long reserveId);
			R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId);

			/**
			* 社区后台-根据社区id统计预约类数据
			@@ -5584,12 +5839,22 @@

			/**
			* 导出登记明细数据
			* @param reserveId 登记id
			* @return 登记明细数据
			*
			* @param pageReserveRegisterDetailedAdminDTO
			* @return 登记明细数据
			*/
			@GetMapping("/reserve/admin/register/list/export")
			R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId);
			@PostMapping("/reserve/admin/register/list/export")
			R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

			/**
			* 查询预约登记题目下属选择项列表
			*
			* @param reserveSubId
			* 预约登记id
			* @return 查询预约登记题目下属选择项列表
			*/
			@GetMapping("/reserve/admin/subject/selection/list")
			List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId);
			/**
			* 查询预约登记题目列表
			* @param reserveId 预约登记id
			@@ -5605,6 +5870,14 @@
			*/
			@PostMapping("/reserve/admin/register/detailed/list")
			R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

			/**
			* 导出登记明细列表
			* @param detailedAdminDTO 请求参数
			* @return 登记明细列表
			*/
			@PostMapping("/reserve/admin/register/detailed/list/export")
			R registerDetailedListAdminExport(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

			/**
			* 查询登记详情记录
			@@ -5670,6 +5943,38 @@
			*/
			@PostMapping("/neighbor/deleteNeighborByApp")
			R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);


			/**
			* 分页查询邻里圈列表
			*
			* @param neighborCircleAppDTO
			* 请求参数
			* @return 邻里圈列表
			*/
			@PostMapping("/neighbor/selectSolve")
			R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);


			/**
			* 修改数据
			* @param editNeighborCircleAdminVO
			* @return
			*/
			@PostMapping("/neighbor/update")
			R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);

			@PostMapping("/neighbor/serviceStatic")
			R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);

			/**
			* 求助我的问题数量统计
			* @param type
			* @param phone
			* @return
			*/
			@GetMapping("/neighbor/selectCount")
			R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId);

			/**
			* 获取系统配置value
			@@ -5769,14 +6074,14 @@
			R timedTaskEldersAuthJobHandler();

			/**
			* 定时任务扫描上月高龄认证使用视频认证的用户添加成功记录
			* 身份认证定时任务
			* @return 执行结果
			*/
			@PostMapping("/elders/auth/record/task")
			R timedTaskEldersAuthRecordJobHandler();

			/**
			* 定时任务每月1号0点统计高龄老人本期应该认证总人数
			* 身份认证定时任务
			* @return 执行结果
			*/
			@PostMapping("/elders/authRecords/statistics")
			@@ -6050,7 +6355,7 @@
			* @return 单条数据
			*/
			@GetMapping("/comActFourMember/{id}")
			R comActFourMemberSelectOne(@PathVariable("id") Integer id);
			R comActFourMemberSelectOne(@PathVariable("id") Long id);

			/**
			* 新增数据
			@@ -6096,6 +6401,16 @@
			*/
			@PostMapping("/common/data/population/second/list")
			R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);

			/**
			* 查询房屋二级级联菜单后台
			*
			* @param cascadeHouseDTO
			* 请求参数
			* @return 菜单列表
			*/
			@PostMapping("/common/data/population/second/listBack")
			R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);

			/**
			* 微心愿处理人列表
			@@ -6208,7 +6523,7 @@
			* @return
			*/
			@GetMapping("/convenient/service-category/all")
			R getAllServiceCategories();
			R getAllServiceCategories(@RequestParam("areaCode") String areaCode);

			/**
			* 获取用户便民服务商家详情
			@@ -6329,7 +6644,7 @@
			* @return
			*/
			@GetMapping("/convenient/service-category/suitable")
			R getSuitableServiceCategories(@RequestParam("communityId") Long communityId);
			R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode);

			/**
			* 获取该社区下的热门商家
			@@ -6563,4 +6878,3469 @@
			*/
			@PostMapping("pagemicrowishAdmin")
			R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO);

			/**
			* 小程序四长四员查询居民列表
			*/
			@PostMapping("/comActFourMember/member")
			R comActFourMemberQueryMember(@RequestBody CommonPage commonPage);

			/**
			*居民数据详情
			*/
			@GetMapping("/comActFourMember/memberDetail")
			R comActFourMemberMemberDetail(@RequestParam("id")Long id);

			/**
			* 根据房屋id列表删除房屋信息
			*
			* @param comMngPopulationHouseUserVO
			* 请求参数
			* @return 删除结果
			*/
			@PostMapping("/common/data/population/house/user/delete")
			R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

			/**
			* 新增实有房屋信息
			*
			* @param comMngPopulationHouseUserVO
			* 请求参数
			* @return 编辑结果
			*/
			@PostMapping("/common/data/population/house/user/insert")
			public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

			/**
			* 编辑实有房屋信息
			*
			* @param comMngPopulationHouseUserVO
			* 请求参数
			* @return 编辑结果
			*/
			@PostMapping("/common/data/population/house/user/edit")
			public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

			/**
			* 根据id查询
			*
			* @param id
			* 请求参数
			* @return 删除结果
			*/
			@GetMapping("/common/data/population/house/user/detail")
			public R detailHousesUser(@RequestParam("id") Long id);

			/**
			* 社区后台-分页查询楼栋列表
			* @param pageBuildingListDto 请求参数
			* @return 楼栋列表
			*/
			@PostMapping("/building/page/admin/")
			R pageBuildingAdmin(@RequestBody PageBuildingListDto pageBuildingListDto);

			/**
			* 社区后台-查询楼栋列表表头统计数据
			* @param communityId 社区id
			* @return 楼栋列表表头统计数据
			*/
			@GetMapping("/building/header/statistics/")
			R buildingListHeaderStatisticsAdmin(@RequestParam("communityId") Long communityId);

			/**
			* 社区后台-查询楼栋详情
			* @param id 楼栋id
			* @return 楼栋详情
			*/
			@GetMapping("/building/detail/admin/")
			R detailBuildAdmin(@RequestParam("id") Long id);

			/**
			* 查询楼栋下单元列表
			* @param id 楼栋id
			* @return 单元列表
			*/
			@GetMapping("/building/unit/list/admin")
			R buildingUnitListAdmin(@RequestParam("id") Long id);

			/**
			* 查询楼栋单元下房屋列表
			* @param unitHouseListDto 请求参数
			* @return 单元列表
			*/
			@PostMapping("/building/unit/house/list/admin")
			R buildingUnitHouseListAdmin(@RequestBody PageBuildingUnitHouseListDto unitHouseListDto);

			/**
			* 查询楼栋单元下房屋详情
			* @param houseId 房屋id
			* @param communityId 社区id
			* @return 房屋详情
			*/
			@GetMapping("/building/unit/house/detail/admin")
			R unitHouseDetailAdmin(@RequestParam("houseId") Long houseId,@RequestParam("communityId") Long communityId);

			/**
			* 查询社区下小区列表
			* @param communityId 社区id
			* @return 小区列表
			*/
			@GetMapping("/building/village/list/admin")
			R buildingVillageListAdmin(@RequestParam("communityId") Long communityId);

			/**
			* 添加楼栋下单元
			* @param addBuildingUnitDto 请求参数
			* @return 添加结果
			*/
			@PostMapping("/building/unit/add/admin")
			R addBuildingUnitAdmin(@RequestBody AddBuildingUnitDto addBuildingUnitDto);

			/**
			* 修改楼栋下单元
			* @param editBuildingUnitDto 请求参数
			* @return 修改结果
			*/
			@PostMapping("/building/unit/edit/admin")
			R editBuildingUnitAdmin(@RequestBody EditBuildingUnitDto editBuildingUnitDto);

			/**
			* 添加户室
			* @param addBuildingHouseDto 请求参数
			* @return 添加结果
			*/
			@PostMapping("/building/house/add/admin")
			R addBuildingHouseAdmin(@RequestBody AddBuildingHouseDto addBuildingHouseDto);

			/**
			* 修改户室
			* @param editBuildingHouseDto 请求参数
			* @return 修改结果
			*/
			@PostMapping("/building/house/edit/admin")
			R editBuildingHouseAdmin(@RequestBody EditBuildingHouseDto editBuildingHouseDto);

			/**
			* 删除户室下人员关联信息
			* @param housePopulationDto 请求参数
			* @return 删除结果
			*/
			@PostMapping("/building/house/population/delete/admin")
			R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);

			/**
			* 删除楼栋
			* @param id
			* @return
			*/
			@GetMapping("/building/delete")
			R buildingDelete(@RequestParam("id")Long id);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActWarehouseApply/queryAll")
			public R comActWarehouseApplySelectAll(@RequestBody CommonPage commonPage);

			/**
			* 统计查询
			*
			* @param communityId
			* @return 所有数据
			*/
			@GetMapping("/comActWarehouseApply/selectStatics")
			public R comActWarehouseApplySelectAll(@RequestParam("communityId") Long communityId);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActWarehouseApply/{id}")
			public R comActWarehouseApplySelectOne(@PathVariable("id") Integer id);

			/**
			* 新增数据
			*
			* @param comActWarehouseApply 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActWarehouseApply")
			public R comActWarehouseApplyInsert(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);

			/**
			* 修改数据
			*
			* @param comActWarehouseApply 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActWarehouseApply/update")
			public R comActWarehouseApplyUpdate(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActWarehouseApply/del")
			public R comActWarehouseApplyDelete(@RequestParam("id") Long id);

			/**
			* 生成二维码
			* @param qrCodeVO
			* @return
			*/
			@PostMapping("/comActWarehouseApply/getQRCode")
			public R comActWarehouseApplyGetQRCode(@RequestBody QRCodeVO qrCodeVO);

			/**
			* 社区Id查询基础配置
			* @param communityId
			* @return
			*/
			@GetMapping("/comActWarehouseBase")
			public R comActWarehouseBaseSelectOne(@RequestParam("communityId") Long communityId);

			/**
			* 新增数据
			*
			* @param comActWarehouseBase 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActWarehouseBase")
			public R comActWarehouseBaseInsert(@RequestBody ComActWarehouseBaseVO comActWarehouseBase);

			/**
			* 导出数据
			*/
			@PostMapping("/comActWarehouseApply/export")
			public R comActWarehouseApplyExport(@RequestBody CommonPage commonPage);

			/**
			* 后台导入捐赠物品
			* @param list
			* @return
			*/
			@PostMapping("/comActWarehouseDonates/import")
			R batchImportWarehouseDonates(@RequestBody List<WarehouseDonatesExcelVO> list);

			/**
			* 后台导出捐赠物品表格
			* @param exportDonatesDTO
			* @return
			*/
			@PostMapping("/comActWarehouseDonates/donates/export")
			R exportDonates(@RequestBody ExportDonatesDTO exportDonatesDTO);

			/**
			* 分页查询捐赠物品
			* @param pageDonatesDTO
			* @return
			*/
			@PostMapping("/comActWarehouseDonates/donates/page")
			R pageDonates(@RequestBody PageDonatesDTO pageDonatesDTO);

			/**
			* 新增物品捐赠
			* @param comActWarehouseDonatesDTO
			* @return
			*/
			@PostMapping("/comActWarehouseDonates/donates/add")
			R addDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO);

			/**
			* 查看物品捐赠详情
			* @param donatesId
			* @param isWhich
			* @param userId
			* @return
			*/
			@GetMapping("/comActWarehouseDonates/donates/get")
			R getDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("isWhich") Integer isWhich, @RequestParam("userId") Long userId);

			/**
			* 捐赠物品后台签收
			* @param comActWarehouseDonatesDTO
			* @return
			*/
			@PostMapping("/comActWarehouseDonates/donates/signing")
			R signingDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO);

			/**
			* 用户取消捐赠
			* @param donatesId
			* @param currentUser
			* @return
			*/
			@GetMapping("/comActWarehouseDonates/donates/cancel")
			R cancelDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("currentUser") Long currentUser);

			/**
			* 捐赠物品统计查询
			* @param communityId
			* @return
			*/
			@GetMapping("/comActWarehouseDonates/donates/statistics")
			R getDonatesStatistics(@RequestParam("communityId") Long communityId);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActWarehouseOperation/queryAll")
			public R comActWarehouseOperationSelectAll(@RequestBody CommonPage commonPage);

			/**
			* 物品领用
			* @param comActWarehouseApplyDTO
			* @return
			*/
			@PostMapping("/comActWarehouseDonates/donates/apply")
			R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);

			/**
			* 生成二维码
			* @param qrCodeVO
			* @return
			*/
			@PostMapping("/comActActivityCode/getQRCode")
			public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);

			/**
			* 重置二维码
			* @param qrCodeVO
			* @return
			*/
			@PostMapping("/comActActivityCode/resetQRCode")
			public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);

			/**
			* 实有房屋数据修复定时任务
			* @return 实有房屋数据修复定时任务
			*/
			@GetMapping("/population/house/status/task")
			R timedTaskHouseJobHandler();

			/**
			* 导出特殊群体
			*
			* @param pageInputUserDTO 请求参数
			* @return 特殊群体列表
			*/
			@PostMapping("common/data/special/export")
			R specialInputUserExport(@RequestBody PageInputUserDTO pageInputUserDTO);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActAnnouncement/queryAll")
			R comActAnnouncementSelectAll(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActAnnouncement/{id}")
			R comActAnnouncementSelectOne(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param comActAnnouncementVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActAnnouncement")
			R comActAnnouncementInsert(@RequestBody ComActAnnouncementVO comActAnnouncementVO);

			/**
			* 修改数据
			*
			* @param comActAnnouncementVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActAnnouncement/update")
			R comActAnnouncementUpdate(@RequestBody ComActAnnouncementVO comActAnnouncementVO);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActAnnouncement/del")
			R comActAnnouncementDelete(@RequestParam("id") Long id);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActColumn/queryAll")
			R comActColumnSelectAll(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActColumn/{id}")
			R comActColumnSelectOne(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param comActColumn 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActColumn")
			R comActColumnInsert(@RequestBody ComActColumnVO comActColumn);

			/**
			* 修改数据
			*
			* @param comActColumn 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActColumn/update")
			R comActColumnUpdate(@RequestBody ComActColumnVO comActColumn);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActColumn/del")
			R comActColumnDelete(@RequestParam("id") Long id);

			/**
			* 高龄认证添加
			*
			* @param comElderAuthRecordVO
			* @return
			*/
			@PostMapping("/elders/authRecord/add")
			R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);

			/**
			* 养老认证添加
			*
			* @param comElderAuthRecordVO
			* @return
			*/
			@PostMapping("/elders/pensionAuthRecord/add")
			R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
			/**
			* 活动报名签到情况
			* @param id 活动主键id
			* @return
			*/
			@GetMapping("/activity/sign-in/list")
			R listSignInRecord(@RequestParam("id") Long id);

			/**
			* 活动签到记录
			* @param id 活动主键
			* @param userId 用户id
			* @return
			*/
			@GetMapping("/activity/regist/list")
			R listRegistRecord(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

			/**
			* 获取活动类型（目前只有志愿者活动需要获取）
			* @param communityId
			* @param type
			* @return
			*/
			@GetMapping("/activity/type/list")
			R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);

			/**
			* 添加活动类型
			* @param comActActivityTypeVO
			* @return
			*/
			@PostMapping("/activity/type/add")
			R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO);

			/**
			* 我的评价
			* @param userId
			* @param activityId
			* @return
			*/
			@GetMapping("/activity/my-evaluate")
			R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId);

			/**
			* 分页查询居家隔离统计
			* @param detailedAdminDTO
			* @return
			*/
			@PostMapping("/reserve/admin/register/homeQuarantine/page")
			R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

			/**
			* 居家隔离导出
			* @param pageReserveRegisterDetailedAdminDTO
			* @return
			*/
			@PostMapping("/reserve/admin/homeQuarantine/export")
			R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

			/**
			* 分页查询物业宣传
			* @param pageComPropertyPublicityDTO
			* @return
			*/
			@PostMapping("/property/publicity/page")
			R pageComPropertyPublicity(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);

			/**
			* 新增物业宣传
			* @param comPropertyPublicityDTO
			* @return
			*/
			@PostMapping("/property/publicity/add")
			R addComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);

			/**
			* 修改物业宣传
			* @param comPropertyPublicityDTO
			* @return
			*/
			@PostMapping("/property/publicity/update")
			R updateComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);

			/**
			* 查看物业宣传信息
			* @param id
			* @return
			*/
			@GetMapping("/property/publicity/get")
			R getComPropertyPublicity(@RequestParam("id") Long id);

			/**
			* 删除物业宣传
			* @param id
			* @return
			*/
			@DeleteMapping("/property/publicity/delete")
			R deleteComPropertyPublicity(@RequestParam("id") Long id);

			/**
			* 物业公司列表
			*
			* @param villageId
			* @param communityId
			* @return
			*/
			@GetMapping("/property/publicity/list/property")
			R listProperty(@RequestParam(value = "villageId", required = false) Long villageId, @RequestParam("communityId") Long communityId);

			/**
			* 分页查询物业宣传-小程序
			* @param pageComPropertyPublicityDTO
			* @return
			*/
			@PostMapping("/property/publicity/page/applet")
			R pageComPropertyPublicityApplet(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);

			/**
			* 增加物业宣传浏览量
			* @param id
			* @return
			*/
			@GetMapping("/property/publicity/incr-view")
			R incrPropertyPublicityView(@RequestParam("id") Long id);

			/**
			* 获取预设图片
			* @param type
			* @param subtype
			* @return
			*/
			@GetMapping("/picture/library/get")
			R getPresetPictureLibrary(@RequestParam("type") Integer type, @RequestParam("subtype") Integer subtype);

			/**
			* 分页查询房屋租赁基础配置
			* @param pageRentingHousesConfigDTO
			* @return
			*/
			@PostMapping("/rentingHousesConfig/page")
			R pageRentingHousesConfig(@RequestBody PageRentingHousesConfigDTO pageRentingHousesConfigDTO);

			/**
			* 更新配置信息
			* @param rentingHousesConfigDTO
			* @return
			*/
			@PutMapping("/rentingHousesConfig/update")
			R updateRentingHousesConfig(@RequestBody RentingHousesConfigDTO rentingHousesConfigDTO);

			/**
			* 新增房源信息
			* @param registerDTO
			* @return
			*/
			@PostMapping("/rentingHourseRegister/register")
			R registerRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);

			/**
			* 编辑房源信息
			* @param registerDTO
			* @return
			*/
			@PostMapping("/rentingHourseRegister/update")
			R updateRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);

			/**
			* 分页获取房源信息
			* @param pageRegisterDTO
			* @return
			*/
			@PostMapping("/rentingHourseRegister/page")
			R pageRentingHouse(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);

			/**
			* 发布/取消发布房源信
			* @param releaseOrCancelHouseDTO
			* @return
			*/
			@PutMapping("/rentingHourseRegister/releaseOrCancel")
			R releaseOrCancelHouse(@RequestBody ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO);

			/**
			* 删除房源信息
			* @param registerId
			* @return
			*/
			@DeleteMapping("/rentingHourseRegister/delete")
			R deleteRentingHouse(@RequestParam("registerId") Long registerId);

			/**
			* 获取详情-房源信息
			* @param registerId
			* @return
			*/
			@GetMapping("/rentingHourseRegister/get")
			R getRentingHouse(@RequestParam("registerId") Long registerId);

			/**
			* 附近的房源
			*/
			@PostMapping("/rentingHourseRegister/nearby")
			R nearby(@RequestBody NearbyDTO nearbyDTO);

			/**
			* 小程序分页获取房源信息
			* @param pageRegisterDTO
			* @return
			*/
			@PostMapping("/rentingHourseRegister/houseList")
			R pageRentingHouseApplet(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/rentingHourseOrder/queryAll")
			R selectRentingHourseOrderAll(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/rentingHourseOrder/{id}")
			R selectRentingHourseOrderOne(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param rentingHourseOrder 实体对象
			* @return 新增结果
			*/
			@PostMapping("/rentingHourseOrder")
			R insertRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrder);

			/**
			* 修改数据
			*
			* @param rentingHourseOrdervo 实体对象
			* @return 修改结果
			*/
			@PostMapping("/rentingHourseOrder/update")
			R updateRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrdervo);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/rentingHourseOrder/del")
			R deleteRentingHourseOrder(@RequestParam("id") Long id);

			/**
			* 支付回调处理订单状态以及房屋状态
			*/
			@PostMapping("/rentingHourseOrder/wxNotify")
			R wxNotifyRentingHourseOrder(@RequestBody WxPayNotifyOrderVO wxPayNotifyOrderVO);

			/**
			* 支付付款
			*/
			@PostMapping("/rentingHourseOrder/wxPay")
			R wxPayRentingHourseOrder(@RequestBody WxPayOrderVO wxPayOrderVO);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/rentingHoursePreOrder/queryAll")
			R selectAllRentingHoursePreOrder(@RequestBody CommonPage commonPage);
			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/rentingHoursePreOrder/{id}")
			R selectOneRentingHoursePreOrder(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param rentingHoursePreOrderVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/rentingHoursePreOrder")
			R insertRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

			/**
			* 修改数据
			*
			* @param rentingHoursePreOrderVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/rentingHoursePreOrder/update")
			R updateRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/rentingHoursePreOrder/del")
			R deleteRentingHoursePreOrder(@RequestParam("id") Long id);

			/**
			* 普通订单统计
			*/
			@PostMapping("/rentingHourseOrder/statics")
			R staticsRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrderVO);

			/**
			* 定金订单统计
			*/
			@PostMapping("/rentingHoursePreOrder/statics")
			R staticsRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

			/**
			* 获取房屋租赁配置
			* @return
			* @param type
			*/
			@GetMapping("/rentingHousesConfig/getConfig")
			R getRentingHouseConfig(@RequestParam("type") Integer type);

			@GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
			@Async
			void updateAllHouseUnionAppCode(@RequestParam("areaCode") String areaCode);

			/**
			* 西区大屏治理数据
			*/
			@GetMapping("/screen/getWestScreenStatics")
			R westScreenStatics();

			/**
			* 西区大屏一标三实数据
			* @return 西区大屏一标三实数据
			*/
			@GetMapping("/screen/getComprehensivePopulationStatics")
			R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);

			@GetMapping("/screen/getComprehensiveStreetList")
			R getComprehensiveStreetList();

			/**
			* 通过社区id查询社区账号密码
			* @param communityId 社区id
			* @return 查询社区账号密码
			*/
			@GetMapping("/screen/getCommunityPassword")
			R getCommunityPassword(@RequestParam("communityId") Long communityId);

			@GetMapping("/reserve/bigScreenStaticsReserve")
			R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId);

			/**
			* 党员活动折线图
			* @param communityId
			* @return
			*/
			@GetMapping("/bigscreen/party/partyActivityLine")
			R partyActivityLine(@RequestParam("communityId")Long communityId);

			/**
			* 党员积分前3
			* @param pageBigScreenStatisticPartyOrg
			* @return
			*/
			@PostMapping("/bigscreen/party/partyActivityTop")
			R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);

			/**
			* 社区服务大屏数据分析接口
			*/
			@GetMapping("/screen/serviceData")
			R serviceData(@RequestParam("communityId")Long communityId);

			/**
			* 服务居民接口
			*/
			@GetMapping("/screen/serviceUser")
			R serviceUser(@RequestParam("communityId") Long communityId);

			/**
			* 大数据分析平台-居民自治
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/resident/autonomy")
			R getResidentAutonomy(@RequestParam("communityId") Long communityId);

			/**
			* 大数据分析平台-清网治格
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/grids/governance")
			R getGridsGovernance(@RequestParam("communityId") Long communityId);

			/**
			* 大数据分析平台-社区服务
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/community/service")
			R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId);

			/**
			* 分页获取热度排行商家
			* @param pagePopularMerchantDTO
			* @return
			*/
			@PostMapping("/screen/merchant/popular")
			R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);

			/**
			* 新版大屏首页接口
			*/
			@GetMapping("/screen/indexInfo")
			R indexInfo(@RequestParam("communityId") Long communityId);

			/**
			* 首页二级页面-微心愿
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/index/microWish")
			R indexMicroWish(@RequestParam("communityId") Long communityId);

			/**
			* 首页二级页面-随手拍
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/index/easyPhoto")
			R indexEasyPhoto(@RequestParam("communityId") Long communityId);

			/**
			* 首页二级页面-随手拍展示列表
			* @return
			*/
			@PostMapping("/screen/index/easyPhotoList")
			R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 首页二级页面-社区问卷
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/index/questionnaire")
			R indexQuestionnaire(@RequestParam("communityId") Long communityId);

			/**
			* 首页二级页面-社区动态
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/index/dyn")
			R indexDyn(@RequestParam("communityId") Long communityId);

			/**
			* 首页二级页面-社区动态展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/index/dynList")
			R indexDynList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 首页二级页面-邻里圈
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/index/neighbor")
			R indexNeighbor(@RequestParam("communityId") Long communityId);

			/**
			* 首页二级页面-邻里圈展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/index/neighborList")
			R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 首页二级页面-便民商家
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/index/merchant")
			R indexMerchant(@RequestParam("communityId") Long communityId);

			/**
			* 首页二级页面-商家展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/index/merchantList")
			R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 首页二级页面-微心愿展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/index/microWishList")
			R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 首页二级页面-社区问卷展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/index/questionnaireList")
			R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 首页二级页面-居民活动
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/index/residentAct")
			R indexResidentAct(@RequestParam("communityId") Long communityId);

			/**
			* 首页二级页面-居民活动展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/index/residentActList")
			R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 首页二级页面-志愿者活动
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/index/volunteerAct")
			R indexVolunteerAct(@RequestParam("communityId") Long communityId);

			/**
			* 首页二级页面-志愿者活动展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/index/volunteerActList")
			R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 清网治格-根据事件分类获取近1月的社区事件数据
			* @param type
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/event/list")
			R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId);

			/**
			* 清网治格-社区事件数据分页
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/event/page")
			R pageEventList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 新增数字商业街商家
			* @param mcsMerchantDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/merchant/add")
			R addMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);

			/**
			* 编辑数字商业街商家
			* @param mcsMerchantDTO
			* @return
			*/
			@PutMapping("/microcommercialstreet/merchant/put")
			R putMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);

			/**
			* 查询数字商业街商家详情
			* @param merchantId
			* @return
			*/
			@GetMapping("/microcommercialstreet/merchant/get")
			R getMcsMerchant(@RequestParam("merchantId") Long merchantId);

			/**
			* 删除数字商业街商家
			* @param merchantId
			* @param userId
			* @return
			*/
			@DeleteMapping("/microcommercialstreet/merchant/delete")
			R deleteMcsMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("userId") Long userId);

			/**
			* 分页查询数字商业街商家
			* @param pageMcsMerchantDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/merchant/page")
			R pageMcsMerchant(@RequestBody PageMcsMerchantDTO pageMcsMerchantDTO);

			/**
			* 禁用/启用数字商业街商家
			* @param disableOrEnableMcsMerchantDTO
			* @return
			*/
			@PutMapping("/microcommercialstreet/merchant/disable-or-enable")
			R disableOrEnableMcsMerchant(@RequestBody DisableOrEnableMcsMerchantDTO disableOrEnableMcsMerchantDTO);

			/**
			* 获取所有数字商业街配置
			* @return
			*/
			@GetMapping("/microcommercialstreet/config/all")
			R getAllMcsConfig();

			/**
			* 修改数字商业街配置
			* @param configs
			* @return
			*/
			@PutMapping("/microcommercialstreet/config/put")
			R putMcsConfig(@RequestBody List<McsConfigVO> configs);

			/**
			* 分页查询戳戳游戏
			* @param pageMcsGameDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/game/page")
			R pageMcsGame(@RequestBody PageMcsGameDTO pageMcsGameDTO);

			/**
			* 设为/取消游戏热门
			* @param setPopularForGameDTO
			* @return
			*/
			@PutMapping("/microcommercialstreet/game/setPopular")
			R setPopularForGame(@RequestBody SetPopularForGameDTO setPopularForGameDTO);

			/**
			* 上架/下架戳戳游戏
			* @param setShelfForGameDTO
			* @return
			*/
			@PutMapping("/microcommercialstreet/game/setShelf")
			R setShelfForGame(@RequestBody SetShelfForGameDTO setShelfForGameDTO);

			/**
			* 删除戳戳游戏
			* @param gameId
			* @param userId
			* @return
			*/
			@DeleteMapping("/microcommercialstreet/game/delete")
			R deleteMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);

			/**
			* 分页查询戳戳资讯
			* @param pageMcsInformationDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/information/page")
			R pageMcsInfo(@RequestBody PageMcsInformationDTO pageMcsInformationDTO);

			/**
			* 上架/下架戳戳资讯
			* @param setShelfForInfoDTO
			* @return
			*/
			@PutMapping("/microcommercialstreet/information/setShelf")
			R setShelfForMcsInfo(@RequestBody SetShelfForInfoDTO setShelfForInfoDTO);

			/**
			* 删除戳戳资讯
			* @param infoId
			* @param userId
			* @return
			*/
			@DeleteMapping("/microcommercialstreet/information/delete")
			R deleteMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);

			/**
			* 分页查询评价记录
			* @param pageMcsEvaluateDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/evaluate/page")
			R pageMcsEvaluate(@RequestBody PageMcsEvaluateDTO pageMcsEvaluateDTO);

			/**
			* 查询评价记录详情
			* @param evaluateId
			* @return
			*/
			@GetMapping("/microcommercialstreet/evaluate/get")
			R getMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);

			/**
			* 删除评价记录
			* @param evaluateId
			* @return
			*/
			@DeleteMapping("/microcommercialstreet/evaluate/delete")
			R deleteMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);

			/**
			* 新增戳戳游戏
			* @param mcsGameDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/game/add")
			R addMcsGame(@RequestBody McsGameDTO mcsGameDTO);

			/**
			* 编辑戳戳游戏
			* @param mcsGameDTO
			* @return
			*/
			@PutMapping("/microcommercialstreet/game/put")
			R putMcsGame(@RequestBody McsGameDTO mcsGameDTO);

			/**
			* 发布戳戳游戏
			* @param gameId
			* @param userId
			* @return
			*/
			@GetMapping("/microcommercialstreet/game/publish")
			R publishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);

			/**
			* 结束戳戳游戏
			* @param gameId
			* @param userId
			* @return
			*/
			@GetMapping("/microcommercialstreet/game/finish")
			R finishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);

			/**
			* 戳戳游戏/资讯顶部统计数据
			* @param type
			* @param userId
			* @return
			*/
			@GetMapping("/microcommercialstreet/statistics/top")
			R getTopStatistics(@RequestParam("type") Integer type, @RequestParam("userId") Long userId);

			/**
			* 新增戳戳资讯
			* @param mcsInfoDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/information/add")
			R addMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);

			/**
			* 编辑戳戳资讯
			* @param mcsInfoDTO
			* @return
			*/
			@PutMapping("/microcommercialstreet/information/put")
			R putMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);

			/**
			* 发布戳戳资讯
			* @param infoId
			* @param userId
			* @return
			*/
			@GetMapping("/microcommercialstreet/information/publish")
			R publishMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);

			/**
			* 新增产品信息
			* @param mcsProductDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/product/add")
			R addMcsProduct(@RequestBody McsProductDTO mcsProductDTO);

			/**
			* 编辑产品信息
			* @param mcsProductDTO
			* @return
			*/
			@PutMapping("/microcommercialstreet/product/put")
			R putMcsProduct(@RequestBody McsProductDTO mcsProductDTO);

			/**
			* 删除产品信息
			* @param deleteProductDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/product/delete")
			R deleteMcsProduct(@RequestBody DeleteProductDTO deleteProductDTO);

			/**
			* 上架/下架产品信息
			* @param setShelfForProductDTO
			* @return
			*/
			@PutMapping("/microcommercialstreet/product/setShelf")
			R setShelfForMcsProduct(@RequestBody SetShelfForProductDTO setShelfForProductDTO);

			/**
			* 分页查询产品信息
			* @param pageMcsProductDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/product/page")
			R pageMcsProduct(@RequestBody PageMcsProductDTO pageMcsProductDTO);

			/**
			* 获取产品标签列表
			* @param userId
			* @return
			*/
			@GetMapping("/microcommercialstreet/label/list")
			R getMcsLabelList(@RequestParam("userId") Long userId);

			/**
			* check商家/店铺是否有效
			* @param userId
			* @return
			*/
			@GetMapping("/shop/checkStoreIsValid")
			R checkStoreIsValid(@RequestParam("userId") Long userId);

			/**
			* 根据account查询微商业街商家信息
			* @param account
			* @return
			*/
			@GetMapping("/microcommercialstreet/getMcsMerchantByAccount")
			R getMcsMerchantByAccount(@RequestParam("account") String account);

			/**
			* 完成订单更新/新增商家信息
			* @param merchantName
			* @param configId
			* @param userId
			* @return
			*/
			@GetMapping("/microcommercialstreet/updateAfterOrder")
			R updateMcsMerchantAfterOrder(@RequestParam(value = "merchantName", required = false) String merchantName,
			@RequestParam("configId") Long configId, @RequestParam("userId") Long userId);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/mcsOrder/queryAll")
			R selectAllMscOrder(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/mcsOrder/{id}")
			R selectOneMscOrder(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param mcsOrderVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/mcsOrder")
			R insertMscOrder(@RequestBody McsOrderVO mcsOrderVO);

			/**
			* 修改数据
			*
			* @param mcsOrderVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/mcsOrder/update")
			R updateMscOrder(@RequestBody McsOrderVO mcsOrderVO);

			/**
			* 微信支付
			* @param mcsOrderVO
			* @return
			*/
			@PostMapping("/mcsOrder/wxPay")
			R wxPayMscOrder(McsOrderVO mcsOrderVO);

			/**
			* 发送提醒短信
			* @param id
			* @return
			*/
			@GetMapping("/mcsOrder/sendContent")
			R sendContentMcsOrder(@RequestParam("id") Long id);

			/**
			*微信支付回调
			* @param mcsOrderVO
			* @return
			*/
			@PostMapping("/mcsOrder/notify")
			R notifyMcsOrder(@RequestBody McsOrderVO mcsOrderVO);

			/**
			* 验证码登录
			* @param loginDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/loginWithPhone")
			R loginWithPhone(@RequestBody LoginWithPhoneDTO loginDTO);

			/**
			* 首页顶部数据
			* @return
			*/
			@GetMapping("/microcommercialstreet/index/topData")
			R getMcsIndexTopData();

			/**
			* 戳戳卷领取
			* @param gameId
			* @param userId
			* @return
			*/
			@GetMapping("/microcommercialstreet/coupon/apply")
			R applyMcsCoupon(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);

			/**
			* h5分页查询戳戳资讯
			* @param pageMcsInformationDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/information/pageH5")
			R pageH5McsInfo(@RequestBody PageMcsInformationDTO pageMcsInformationDTO);

			/**
			* h5分页查询戳戳游戏
			* @param pageMcsGameDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/game/pageH5")
			R pageH5McsGame(@RequestBody PageMcsGameDTO pageMcsGameDTO);

			/**
			* 游戏详情
			* @param gameId
			* @return
			*/
			@GetMapping("/microcommercialstreet/game/get")
			R getMcsGame(@RequestParam("gameId") Long gameId);

			/**
			* 资讯详情
			* @param infoId
			* @return
			*/
			@GetMapping("/microcommercialstreet/info/get")
			R getMcsInfo(@RequestParam("infoId") Long infoId);

			/**
			* H5分页查询数字商业街商家
			* @param pageMcsMerchantDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/merchant/pageH5")
			R pageH5McsMerchant(@RequestBody PageMcsMerchantDTO pageMcsMerchantDTO);

			/**
			* 我的戳戳卷
			* @param type
			* @param userId
			* @return
			*/
			@GetMapping("/microcommercialstreet/myCoupon")
			R getMyCoupon(@RequestParam(value = "type", required = false) Integer type, @RequestParam("userId") Long userId);

			/**
			* 新增评价记录
			* @param mcsEvaluateDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/evaluate/add")
			R addMcsEvaluate(@RequestBody McsEvaluateDTO mcsEvaluateDTO);

			/**
			* 我的评价-参与游戏列表
			* @param pageJoinGameListDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/joinGame/page")
			R getJoinGameList(@RequestBody PageJoinGameListDTO pageJoinGameListDTO);

			/**
			* 戳戳卷核销
			* @param couponId
			* @param userId
			* @return
			*/
			@GetMapping("/microcommercialstreet/coupon/verify")
			R verifyMcsCoupon(@RequestParam("couponId") Long couponId, @RequestParam("userId") Long userId);

			/**
			* 分页查询核销记录
			* @param pageVerifyRecordDTO
			* @return
			*/
			@PostMapping("/microcommercialstreet/verifyRecord/page")
			R pageMcsVerifyRecord(@RequestBody PageVerifyRecordDTO pageVerifyRecordDTO);

			/**
			* 游戏统计
			* @param userId
			* @return
			*/
			@GetMapping("/microcommercialstreet/game/statistics")
			R getMcsGameStatistics(@RequestParam("userId") Long userId);

			/**
			* 修改用戶信息
			* @param putUserInfoDTO
			* @return
			*/
			@PutMapping("/microcommercialstreet/putUserInfo")
			R putUserInfo(@RequestBody PutUserInfoDTO putUserInfoDTO);

			/**
			* 根据userId获取商家信息
			* @param userId
			* @return
			*/
			@GetMapping("/microcommercialstreet/retrieveMcsMerchantInfoByUserId")
			R retrieveMcsMerchantInfoByUserId(@RequestParam("userId") Long userId);

			/**
			* 定时任务-每隔5分钟执行一次，将已到期的微商业街商家旗下所有的游戏/资讯全部下架
			* @return
			*/
			@GetMapping("/microcommercialstreet/offResourceForMcsMerchant")
			R offResourceForMcsMerchant();

			/**
			* 获取产品信息详情
			* @param productId
			* @return
			*/
			@GetMapping("/microcommercialstreet/product/get")
			R getMcsProduct(@RequestParam("productId") Long productId);

			/**
			* 定时任务-每隔5分钟执行一次，将已到期的微商业街游戏结束
			* @return
			*/
			@GetMapping("/microcommercialstreet/endStatusForMcsGame")
			R endStatusForMcsGame();

			@GetMapping("/reserve/record/delete")
			R deleteRecord(@RequestParam("recordId")Long recordId);

			/**
			* 历史数据人员类型填充
			* @param newVoList
			* @param communityId
			* @param userId
			* @return
			*/
			@PostMapping("/common/data/history/filled")
			R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
			@RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);

			/**
			* 社区后台-分页查询志愿者组织队伍
			*
			* @param orgTeamDto 请求参数
			* @return 志愿者组织队伍
			*/
			@PostMapping("/comMngVolunteerOrgTeam/page")
			R pageVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);

			/**
			* 社区后台-新增志愿者组织队伍
			*
			* @param orgTeamDto 请求参数
			* @return 新增结果
			*/
			@PostMapping("/comMngVolunteerOrgTeam/add")
			R addVolunteerOrgAdmin(@RequestBody AddComMngVolunteerOrgTeamDto orgTeamDto);

			/**
			* 社区后台-编辑志愿者组织队伍
			*
			* @param orgTeamDto 请求参数
			* @return 编辑结果
			*/
			@PutMapping("/comMngVolunteerOrgTeam/edit")
			R editVolunteerOrgAdmin(@RequestBody EditComMngVolunteerOrgTeamDto orgTeamDto);

			/**
			* 社区后台-删除志愿者组织队伍
			*
			* @param id 主键id
			* @return 删除结果
			*/
			@GetMapping("/comMngVolunteerOrgTeam/delete")
			R deleteVolunteerOrgAdmin(@RequestParam("id") Long id);

			/**
			* 社区后台-查询志愿者组织列表
			*
			* @param orgTeamDto 请求参数
			* @return 志愿者组织列表
			*/
			@PostMapping("/comMngVolunteerOrgTeam/list")
			R listVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);

			/**
			* 社区后台-分页查询服务类型
			*
			* @param serviceTypeDto 请求参数
			* @return 服务类型列表
			*/
			@PostMapping("/comMngVolunteerServiceType/page")
			R pageServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);

			/**
			* 社区后台-新增服务类型
			*
			* @param serviceTypeDto 请求参数
			* @return 新增结果
			*/
			@PostMapping("/comMngVolunteerServiceType/add")
			R addServiceTypeAdmin(@RequestBody AddComMngVolunteerServiceTypeDto serviceTypeDto);

			/**
			* 社区后台-编辑服务类型
			*
			* @param serviceTypeDto 请求参数
			* @return 编辑结果
			*/
			@PutMapping("/comMngVolunteerServiceType/edit")
			R editServiceTypeAdmin(@RequestBody EditComMngVolunteerServiceTypeDto serviceTypeDto);

			/**
			* 社区后台-删除服务类型
			*
			* @param id 主键id
			* @return 删除结果
			*/
			@GetMapping("/comMngVolunteerServiceType/delete")
			R deleteServiceTypeAdmin(@RequestParam("id") Long id);

			/**
			* 社区后台-分页查询志愿者技能列表
			*
			* @param volunteerSkillDto 请求参数
			* @return 志愿者技能列表
			*/
			@PostMapping("/comMngVolunteerSkill/page")
			R pageVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);

			/**
			* 社区后台-新增志愿者技能
			*
			* @param volunteerSkillDto 请求参数
			* @return 新增结果
			*/
			@PostMapping("/comMngVolunteerSkill/add")
			R addVolunteerSkillAdmin(@RequestBody AddComMngVolunteerSkillDto volunteerSkillDto);

			/**
			* 社区后台-编辑志愿者技能
			*
			* @param volunteerSkillDto 请求参数
			* @return 编辑结果
			*/
			@PutMapping("/comMngVolunteerSkill/edit")
			R editVolunteerSkillAdmin(@RequestBody EditComMngVolunteerSkillDto volunteerSkillDto);

			/**
			* 社区后台-删除志愿者技能
			*
			* @param id 主键id
			* @return 删除结果
			*/
			@GetMapping("/comMngVolunteerSkill/delete")
			R deleteVolunteerSkillAdmin(@RequestParam("id") Long id);

			/**
			* 社区后台-查询志愿者服务类型列表
			*
			* @param serviceTypeDto 请求参数
			* @return 志愿者服务列表
			*/
			@PostMapping("/comMngVolunteerServiceType/list")
			R listServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);

			/**
			* 社区后台-查询志愿者技能列表
			*
			* @param volunteerSkillDto 请求参数
			* @return 志愿者技能列表
			*/
			@PostMapping("/comMngVolunteerSkill/list")
			R listVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);

			/**
			* 社区后台-志愿者组织统计
			*
			* @param communityId 社区id
			* @return 志愿者组织统计
			*/
			@GetMapping("/comMngVolunteerOrgTeam/statistics")
			R statisticsVolunteerOrgAdmin(@RequestParam("communityId") Long communityId);

			/**
			* 志愿者导入
			*
			* @param list 志愿者数据列表
			* @param communityId 社区id
			* @param userId 用户id
			* @return 导入结果
			*/
			@PostMapping("/volunteer/import/admin")
			R importVolunteerAdmin(@RequestBody List<ComMngVolunteerExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			@PostMapping("/screen/hmk/baseInfo")
			R hmkBaseInfo(@RequestBody CommonPage commonPage);

			@GetMapping("/screen/hmk/partyProjectActivityLine")
			R partyProjectActivityLine();

			@PostMapping("/screen/hmk/projectActivityTop")
			R projectActivityProject(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialOrg/{id}")
			R comActSocialOrgSelectOne(@PathVariable("id") Long id);


			/**
			* 通过userId查询
			*
			* @param userId 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialOrg/selectByUserId")
			R selectOneByUserId(@RequestParam("userId") Long userId);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActSocialMember/queryAll")
			public R comActSocialMemberSelectAll(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialMember/{id}")
			public R comActSocialMemberSelectOne(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param comActSocialMember 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialMember")
			public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember);

			/**
			* 批量新增数据
			*
			* @param comActSocialMember 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialProjectMember/batch")
			public R comActSocialMemberInsertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember);

			/**
			* 修改数据
			*
			* @param comActSocialMember 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialMember/update")
			public R comActSocialMemberUpdate(@RequestBody ComActSocialMemberVO comActSocialMember);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActSocialMember/del")
			public R comActSocialMemberDelete(@RequestParam("id") Long id);

			/**
			* 新增社工
			* @param comActSocialWorkerAddDTO
			* @return 新增结果
			*/
			@PostMapping("/comActSocialWorker/add")
			R addComactsocialworker(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);

			/**
			* 修改社工
			* @param comActSocialWorkerEditDTO
			* @return 维护结果
			*/
			@PostMapping("/comActSocialWorker/edit")
			R editComactsocialworker(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);

			/**
			* 分页查找社工
			* @param pageComActSocialWorkerDTO
			* @return 维护结果
			*/
			@PostMapping("/comActSocialWorker/page")
			R queryComactsocialworker(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO);//返回 R<IPage<ComActSocialWorkerVO>>

			/**
			* 删除社工
			* @param comActSocialWorkerDeleteDTO
			* @return 平台用户信息
			*/
			@PostMapping("/comActSocialWorker/delete")
			R deleteComactsocialworker(@RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO);

			/**
			* 查询社工详细信息
			* @param id 社工 id
			* @return 查找结果
			*/
			@PostMapping("/comActSocialWorker/{id}")
			R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id);

			/**
			* 批量导入社工
			*
			* @param list 社工集合
			*/
			@PostMapping("/comActSocialWorker/input")
			R listSaveSocialWorkerExcelVO(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId);

			/**
			*活动查询社工列表
			* @param commonPage
			* @return
			*/
			@PostMapping("/comActSocialWorker/activity")
			R activity(@RequestBody CommonPage commonPage);

			/**
			* 社工查询活动
			* @param commonPage
			* @return
			*/
			@PostMapping("/comActSocialWorker/activityList")
			R activityList(@RequestBody CommonPage commonPage);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActSocialWorkerService/queryAll")
			R selectAllComActSocialWorkerService(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialWorkerService/{id}")
			R selectOneComActSocialWorkerService(@PathVariable("id") Long id);

			/**
			* 修改数据
			*
			* @param comActSocialWorkerServiceVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialWorkerService/update")
			R updateComActSocialWorkerService(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActSocialProject/queryAll")
			R selectAllComActSocialProject(@RequestBody CommonPage commonPage);

			/**
			* 平台详情接口
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialProject/{id}")
			R selectOneComActSocialProject(@PathVariable("id") Long id);

			/**
			* 根据项目id分页获取关联项目
			*/
			@PostMapping("/comActSocialProject/getRelation")
			R getRelationComActSocialProject(@RequestBody CommonPage commonPage);

			/**
			* 新增数据
			*
			* @param socialProjectVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialProject")
			R insertComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
			/**
			* 修改数据
			*
			* @param socialProjectVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialProject/update")
			R updateComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActSocialProject/del")
			R deleteComActSocialProject(@RequestParam("id") Long id);
			/**
			* 小程序详情接口
			* @param id
			* @param userId
			* @return
			*/
			@GetMapping("/comActSocialProject/getApplet")
			R getAppletComActSocialProject(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActSocialProjectMember/queryAll")
			public R selectAllComActSocialProjectMember(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialProjectMember/{id}")
			public R selectOneComActSocialProjectMember(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param comActSocialProjectMemberVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialProjectMember")
			public R insertComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);

			/**
			* 修改数据
			*
			* @param comActSocialProjectMemberVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialProjectMember/update")
			public R updateComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActSocialProjectMember/del")
			public R deleteComActSocialProjectMember(@RequestParam("id") Long id);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActSocialProjectPublicity/queryAll")
			public R selectAllComActSocialProjectPublicity(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialProjectPublicity/getByApplet/{id}")
			public R selectOneComActSocialProjectPublicity(@PathVariable("id") Long id);


			/**
			* 新增数据
			*
			* @param comActSocialProjectPublicityVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialProjectPublicity")
			public R insertComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);

			/**
			* 修改数据
			*
			* @param comActSocialProjectPublicityVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialProjectPublicity/update")
			public R updateComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActSocialProjectPublicity/del")
			public R deleteComActSocialProjectPublicity(@RequestParam("id") Long id);
			/**
			* 多条删除数据
			*
			* @param ids 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActSocialProjectPublicity/delBatch")
			public R delBatchComActSocialProjectPublicity(@RequestParam("ids") List<Long> ids);

			/**
			* 根据projectId查询所有进度
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActSocialProjectSchedule/queryAll")
			public R selectAllComActSocialProjectSchedule(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialProjectSchedule/{id}")
			public R selectOneComActSocialProjectSchedule(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param comActSocialProjectScheduleVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialProjectSchedule")
			public R insertComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);

			/**
			* 修改数据
			*
			* @param comActSocialProjectScheduleVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialProjectSchedule/update")
			public R updateComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActSocialProjectSchedule/del")
			public R deleteComActSocialProjectSchedule(@RequestParam("id") Long id);

			/**
			* 项目分类级联
			* @param comActColumnVO
			* @return
			*/
			@PostMapping("/comActColumn/queryLevel")
			public R queryLevel(@RequestBody ComActColumnVO comActColumnVO);

			@PostMapping("/comActRaffle/queryAll")
			R selectAllComActRaffle(@RequestBody CommonPage commonPage);

			@GetMapping("/comActRaffle/detail")
			R selectOneComActRaffle(@RequestParam("id") Long id,@RequestParam("userId")Long userId);

			@PostMapping("/comActRaffle")
			R insertComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);

			@PostMapping("/comActRaffle/update")
			R updateComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);

			@GetMapping("/comActRaffle/del")
			R deleteComActRaffle(@RequestParam("id") Long id);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActRaffleRecord/queryAll")
			R selectAllComActRaffleRecord(@RequestBody CommonPage commonPage);

			@GetMapping("/comActRaffleRecord/queryPrize")
			R queryPrize(@RequestParam("id")Long id);

			/**
			* 生成二维码
			* @param qrCodeVO
			* @return
			*/
			@PostMapping("/comActRaffleRecord/getQRCode")
			R getRaffleQRCode(@RequestBody QRCodeVO qrCodeVO);

			/**
			* 修改数据
			*
			* @param comActRaffleRecordVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActRaffleRecord/update")
			R updateRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);

			@PostMapping("/comActRaffleRecord")
			R insertRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActRaffleRecord/{id}")
			R selectOneRaffleRecord(@PathVariable("id") Long id);
			/**
			* 导出
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActRaffleRecord/export")
			R exportComActRaffleRecord(@RequestBody CommonPage commonPage);

			/**
			* [方法描述] 根据社区ID查询所属城市所在区区域代码，
			*
			* @param communityId
			* 社区ID
			* @return String 区域code
			* @author manailin
			* @date 2022/2/17 10:09
			*/
			@GetMapping("act/getActBelongRegionCode")
			String getActBelongRegionCode(@RequestParam("communityId") Long communityId);

			/**
			* 新增团队类型
			* @param addTeamTypeDTO
			* @return
			*/
			@PostMapping("/fms/teamType/add")
			R addFmsTeamType(@RequestBody AddTeamTypeDTO addTeamTypeDTO);

			/**
			* 修改团队类型
			* @param editTeamTypeDTO
			* @return
			*/
			@PostMapping("/fms/teamType/edit")
			R editFmsTeamType(@RequestBody EditTeamTypeDTO editTeamTypeDTO);

			/**
			* 删除团队类型
			* @param teamTypeId
			* @param communityId
			* @return
			*/
			@DeleteMapping("/fms/teamType/delete")
			R deleteFmsTeamType(@RequestParam("teamTypeId") Long teamTypeId,
			@RequestParam("communityId") Long communityId);

			/**
			* 获取团队类型列表
			* @param communityId
			* @return
			*/
			@GetMapping("/fms/teamType/list")
			R listFmsTeamType(@RequestParam("communityId") Long communityId);

			/**
			* 新增团队
			* @param addTeamDTO
			* @return
			*/
			@PostMapping("/fms/team/add")
			R addFmsTeam(@RequestBody AddTeamDTO addTeamDTO);

			/**
			* 修改团队信息
			* @param editTeamDTO
			* @return
			*/
			@PostMapping("/fms/team/edit")
			R editFmsTeam(@RequestBody EditTeamDTO editTeamDTO);

			/**
			* 删除团队
			* @param teamId
			* @return
			*/
			@DeleteMapping("/fms/team/delete")
			R deleteFmsTeam(@RequestParam("teamId") Long teamId);

			/**
			* 获取团队列表
			* @param teamTypeId
			* @return
			*/
			@GetMapping("/fms/team/list")
			R listFmsTeam(@RequestParam("teamTypeId") Long teamTypeId);

			/**
			* 获取团队详情
			* @param teamId
			* @return
			*/
			@GetMapping("/fms/team/detail")
			R detailFmsTeam(@RequestParam("teamId") Long teamId);

			/**
			* 级联查询团队数据
			* @param communityId
			* @return
			*/
			@GetMapping("/fms/team/cascade")
			R retrieveFmsTeamCascade(@RequestParam("communityId") Long communityId);

			/**
			* 新增团队成员
			* @param addTeamMemberDTO
			* @return
			*/
			@PostMapping("/fms/teamMember/add")
			R addFmsTeamMember(@RequestBody AddTeamMemberDTO addTeamMemberDTO);

			/**
			* 编辑团队成员
			* @param editTeamMemberDTO
			* @return
			*/
			@PostMapping("/fms/teamMember/edit")
			R editFmsTeamMember(@RequestBody EditTeamMemberDTO editTeamMemberDTO);

			/**
			* 删除团队成员
			* @param deleteTeamMemberDTO
			* @return
			*/
			@PostMapping("/fms/teamMember/delete")
			R deleteFmsTeamMember(@RequestBody DeleteTeamMemberDTO deleteTeamMemberDTO);

			/**
			* 分页查询团队成员
			* @param pageTeamMemberDTO
			* @return
			*/
			@PostMapping("/fms/teamMember/page")
			R pageFmsTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);

			/**
			* 微团队顶部统计
			* @param communityId
			* @return
			*/
			@GetMapping("/fms/teamMember/statistics")
			R statisticsFmsTeamMember(@RequestParam("communityId") Long communityId);

			/**
			* 批量导入团队成员
			* @param voList
			* @param communityId
			* @param userId
			* @return
			*/
			@PostMapping("/fms/teamMember/import")
			R listSaveFmsTeamMemberExcelVO(@RequestBody List<ComFmsTeamMemberImportExcelVO> voList,
			@RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);

			/**
			* 团队人员导出
			* @param pageTeamMemberDTO
			* @return
			*/
			@PostMapping("/fms/teamMember/export")
			R exportTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);

			/**
			* 后台新增微服务
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/service/adminAdd")
			R addFmsServiceAdmin(@RequestBody AddFmsServiceAdminDTO adminDTO);

			/**
			* 后台分页查询微服务
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/service/adminPage")
			R pageFmsServiceAdmin(@RequestBody PageFmsServiceAdminDTO adminDTO);

			/**
			* 后台核实微服务
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/service/approval")
			R approvalFmsService(@RequestBody ApprovalFmsServiceAdminDTO adminDTO);

			/**
			* 级联查询团队服务人员
			* @param communityId
			* @return
			*/
			@GetMapping("/fms/teamMember/cascade")
			R retrieveFmsTeamMemberCascade(@RequestParam("communityId") Long communityId);

			/**
			* 后台查看微服务详情
			* @param serviceId
			* @return
			*/
			@GetMapping("/fms/service/detailAdmin")
			R detailFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);

			/**
			* 后台删除微服务
			* @param serviceId
			* @return
			*/
			@DeleteMapping("/fms/service/delete")
			R deleteFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);

			/**
			* 微服务顶部统计
			* @param communityId
			* @return
			*/
			@GetMapping("/fms/service/statistics")
			R statisticsFmsService(@RequestParam("communityId") Long communityId);

			/**
			* 后台导入微服务数据
			* @param voList
			* @param communityId
			* @param userId
			* @return
			*/
			@PostMapping("/fms/service/import")
			R listSaveFmsServiceExcelVO(@RequestBody List<ComFmsServiceImportExcelVO> voList,
			@RequestParam("communityId") Long communityId,
			@RequestParam("userId") Long userId);

			/**
			* 后台新增微讲堂
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/classroom/add")
			R addFmsClassroom(@RequestBody AddFmsClassroomAdminDTO adminDTO);

			/**
			* 后台编辑微讲堂
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/classroom/edit")
			R editFmsClassroom(@RequestBody EditFmsClassroomAdminDTO adminDTO);

			/**
			* 后台删除微讲堂
			* @param id
			* @return
			*/
			@DeleteMapping("/fms/classroom/delete")
			R deleteFmsClassroom(@RequestParam("id") Long id);

			/**
			* 后台获取微讲堂详情
			* @param id
			* @return
			*/
			@GetMapping("/fms/classroom/detail")
			R detailFmsClassroom(@RequestParam("id") Long id);

			/**
			* 后台分页查询微讲堂
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/classroom/pageAdmin")
			R pageFmsClassroomAdmin(@RequestBody PageFmsClassroomAdminDTO adminDTO);

			/**
			* 微讲堂顶部统计
			* @param communityId
			* @return
			*/
			@GetMapping("/fms/classroom/statistics")
			R statisticsFmsClassroom(@RequestParam("communityId") Long communityId);

			/**
			* 后台分页查询微调节/微防控
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/event/page")
			R pageFmsEvent(@RequestBody PageFmsEventAdminDTO adminDTO);

			/**
			* 微调节/微防控顶部统计
			* @param type
			* @param communityId
			* @return
			*/
			@GetMapping("/fms/event/statistics")
			R statisticsFmsEvent(@RequestParam("type") Integer type, @RequestParam("communityId") Long communityId);

			/**
			* 微调节/微防控事件详情
			* @param eventId
			* @return
			*/
			@GetMapping("/fms/event/detail")
			R detailFmsEvent(@RequestParam("eventId") Long eventId);

			/**
			* 小程序分页查询团队信息
			* @param pageFmsTeamDTO
			* @return
			*/
			@PostMapping("/fms/team/pageApplets")
			R pageFmsTeamApplets(@RequestBody PageFmsTeamDTO pageFmsTeamDTO);

			/**
			* 获取微讲堂详情
			* @param id
			* @return
			*/
			@GetMapping("/fms/classroom/detailApplets")
			R detailFmsClassroomApplets(@RequestParam("id") Long id);

			/**
			* 小程序分页查询微调节/微防控
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/event/pageApplets")
			R pageFmsEventApplets(@RequestBody PageFmsEventAdminDTO adminDTO);

			/**
			* 小程序分页查询微服务
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/service/pageApplets")
			R pageFmsServiceApplets(@RequestBody PageFmsServiceAppletsDTO adminDTO);

			/**
			* 小程序查看微服务详情
			* @param serviceId
			* @param userId
			* @return
			*/
			@GetMapping("/fms/service/detailApplets")
			R detailFmsServiceApplets(@RequestParam("serviceId") Long serviceId, @RequestParam(value = "userId", required = false) Long userId);

			/**
			* 微服务申请
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/service/apply")
			R applyFmsService(@RequestBody ApplyFmsServiceDTO adminDTO);

			/**
			* 分页查询我的微服务
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/service/pageMy")
			R pageMyFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);

			/**
			* 微服务评价
			* @param evaluationFmsServiceDTO
			* @return
			*/
			@PostMapping("/fms/service/evaluate")
			R evaluateFmsService(@RequestBody EvaluationFmsServiceDTO evaluationFmsServiceDTO);

			/**
			* 微团队成员分页查询服务处理
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/service/pageDeal")
			R pageDealFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);

			/**
			* 微团队成员服务反馈
			* @param adminDTO
			* @return
			*/
			@PostMapping("/fms/service/feedback")
			R feedbackFmsService(@RequestBody FeedbackFmsServiceDTO adminDTO);

			/**
			* 定时任务针对服务结束后3天还未评价的用户默认好评
			* @return
			*/
			@PostMapping("/fms/service/defaultPraise")
			R timedTaskFmsServiceDefaultPraise();

			@GetMapping("/activity/partyMemberCount")
			R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year);

			/**
			* 根据小区id查询楼栋列表
			* @param villageId 小区id
			* @return 查询楼栋列表
			*/
			@GetMapping("/building/getBuildListByVillageId")
			R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
			/**
			* 党员活动详情数据
			* @return
			*/
			@PostMapping("/activity/partyMemberDetail")
			R partyMemberDetail(@RequestBody CommonPage commonPage);
			/**
			* 导出党员活动详情数据
			* @return
			*/
			@PostMapping("/activity/exportPartyMemberDetail")
			R exportPartyMemberDetail(@RequestBody CommonPage commonPage);

			/**
			* 金沙定制页面-党建引领基础数据
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/partyBuildIng/base")
			R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId);

			/**
			* 党员活动展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/partyBuildIng/partyAct")
			R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 议事投票展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/partyBuildIng/discuss")
			R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 金沙定制页面-四长四员
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/fourMember/base")
			R getFourMemberBaseData(@RequestParam("communityId") Long communityId);

			/**
			* 杨家坪定制页面-五微服务
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/fms/base")
			R getFmsBaseData(@RequestParam("communityId") Long communityId);

			/**
			* 杨家坪定制页面-微团队展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/fms/team")
			R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 杨家坪定制页面-居家养老基础数据
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/alarm/base")
			R getAlarmBaseData(@RequestParam("communityId") Long communityId);

			/**
			* 杨家坪定制页面-报警记录展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/alarm/record")
			R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 杨家坪定制页面-报警设备点位图
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/alarm/pointMap")
			R getAlarmPointMap(@RequestParam("communityId") Long communityId);

			/**
			* 杨家坪定制页面-志愿服务
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/volunteer/base")
			R getVolunteerBaseData(@RequestParam("communityId") Long communityId);

			/**
			* 金沙定制页面-志愿线展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/partyBuildIng/microWish")
			R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 金沙定制页面-四长四员解决问题展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/fourMember/resolve")
			R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 金沙定制页面-四长四员院落议事展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/courtyard/list")
			R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 金沙定制页面-院落议事
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/courtyard/base")
			R getCourtyardBaseData(@RequestParam("communityId") Long communityId);

			/**
			* description queryByPage 分页查询
			*
			* @param comActEasyPhotoHandler 请求参数
			* @return 分页查询返回参数
			* @author lyq
			* @date 2022-03-01 13:45:10
			*/
			@PostMapping("/comActEasyPhotoHandler/page")
			R queryEasyPhotoHandler(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);

			/**
			* description edit 编辑数据
			*
			* @param comActEasyPhotoHandler 请求参数
			* @return 编辑结果
			* @author lyq
			* @date 2022-03-01 13:45:10
			*/
			@PostMapping("/comActEasyPhotoHandler/edit")
			R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);

			@GetMapping("/reserve/fiveCount")
			R fiveCount(@RequestParam("reserveId") Long reserveId);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActEasyPhotoMember/del")
			R comActEasyPhotoMemberDelete(@RequestParam("id") Long id);

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActEasyPhotoMember/queryAll")
			R comActEasyPhotoMemberSelectAll(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActEasyPhotoMember/{id}")
			R comActEasyPhotoMemberSelectOne(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param comActEasyPhotoMemberVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActEasyPhotoMember")
			R comActEasyPhotoMemberInsert(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);

			/**
			* 修改数据
			*
			* @param comActEasyPhotoMemberVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActEasyPhotoMember/update")
			R comActEasyPhotoMemberUpdate(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);

			/**
			* 分页查询所有数据
			*
			* @param comActAcidRecordDTO 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActAcidRecord/queryAll")
			R selectAllComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActAcidRecord/{id}")
			R selectOneComActAcidRecord(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param comActAcidRecordVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActAcidRecord")
			R insertComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);

			/**
			* 修改数据
			*
			* @param comActAcidRecordVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActAcidRecord/update")
			R updateComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);


			/**
			* 小程序修改填报记录
			*
			* @param comActAcidRecordVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActAcidRecord/updateApplets")
			R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActAcidRecord/del")
			R deleteComActAcidRecord(@RequestParam("id") Long id);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActAcidRecord/detailByApp")
			R detailByApp(@RequestParam("id") Long id,@RequestParam("localCity")String localCity);

			@GetMapping("/comActAcidRecord/charts")
			R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity);

			@PostMapping("/comActAcidRecord/export")
			R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);


			/**
			* 5项常规统计
			* @return
			*/
			@GetMapping("/comActAcidRecord/fiveCount")
			R comActAcidRecordFiveCount(@RequestParam("localCity")String localCity);

			/**
			* 7项常规统计
			* @return
			*/
			@GetMapping("/comActAcidRecord/fiveCountPlus")
			R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity,@RequestParam(value = "loginAccount",required = false)String loginAccount);

			@GetMapping("/comActAcidRecord/statics")
			R comActAcidRecordStatics(@RequestParam("date")String date);

			@GetMapping("/comActAcidRecord/test")
			R test();

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActReserveDangerArea/queryAll")
			R selectAllComActReserveDangerArea(@RequestBody CommonPage commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActReserveDangerArea/{id}")
			R selectOneComActReserveDangerArea(@PathVariable("id") Long id);

			/**
			* 修改数据
			*
			* @param comActReserveDangerAreaVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActReserveDangerArea/update")
			R updateComActReserveDangerArea(@RequestBody ComActReserveDangerAreaVO comActReserveDangerAreaVO);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActReserveDangerArea/del")
			R deleteComActReserveDangerArea(@RequestParam("id") Long id);

			/**
			* 风险区数据统计
			* @return
			*/
			@GetMapping("/comActReserveDangerArea/statics")
			R staticsComActReserveDangerArea();

			/**
			* 批量设置起始时间
			* @param editDangerBatchDTO
			* @return
			*/
			@PostMapping("/comActReserveDangerArea/updateBatch")
			R updateBatchComActReserveDangerArea(@RequestBody EditDangerBatchDTO editDangerBatchDTO);

			@GetMapping("/comAreaTownCommunity/areaTownCommunity")
			R areaTownCommunity(@RequestParam("name")String name,@RequestParam("userId")Long userId);

			/**
			* 物业公司详情
			* @param id
			* @return
			*/
			@GetMapping("/comProperty/detail")
			R detailProperty(@RequestParam("id") Long id);

			/**
			* 添加物业工作人员
			* @param propertyWorkerDTO
			* @return
			*/
			@PostMapping("/comPropertyWorker/add")
			R addPropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);

			/**
			* 编辑物业工作人员
			* @param propertyWorkerDTO
			* @return
			*/
			@PutMapping("/comPropertyWorker/update")
			R updatePropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);

			/**
			* 删除物业工作人员
			* @param id
			* @return
			*/
			@DeleteMapping("/comPropertyWorker/delete")
			R deletePropertyWorker(@RequestParam("id") Long id);

			/**
			* 分页查询物业工作人员
			* @param pagePropertyWorkerDTO
			* @return
			*/
			@PostMapping("/comPropertyWorker/page")
			R pagePropertyWorker(@RequestBody PagePropertyWorkerDTO pagePropertyWorkerDTO);

			/**
			* 物业工作人员详情
			* @param id
			* @return
			*/
			@GetMapping("/comPropertyWorker/detail")
			R detailPropertyWorker(@RequestParam("id") Long id);


			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActAcidMember/queryAll")
			R selectAllComActAcidMember(@RequestBody ComActAcidMemberDTO commonPage);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActAcidMember/{id}")
			R selectOneComActAcidMember(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param comActAcidMemberVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActAcidMember")
			R insertComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);

			/**
			* 修改数据
			*
			* @param comActAcidMemberVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActAcidMember/update")
			R updateComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);

			/**
			* 删除数据
			*
			* @param id 主键结合
			* @return 删除结果
			*/
			@GetMapping("/comActAcidMember/del")
			R deleteComActAcidMember(@RequestParam("id") Long id);

			/**
			* 分页查询风险人员
			* @param pageDangerMemberDTO
			* @return
			*/
			@PostMapping("/comActAcidDangerMember/page")
			R pageDangerMember(@RequestBody PageDangerMemberDTO pageDangerMemberDTO);

			/**
			* 后台分页查询风险人员
			* @param pageDangerMemberDTO
			* @return
			*/
			@PostMapping("/comActAcidDangerMember/queryAll")
			R pageDangerMemberAdmin(@RequestBody ComActAcidDangerMemberDTO pageDangerMemberDTO);

			/**
			* 列表查询
			*
			* @param comActAcidCheckRecordDTO 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActAcidCheckRecord/queryAll")
			R selectAllComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO);

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActAcidCheckRecord/{id}")
			R selectOneComActAcidCheckRecord(@PathVariable("id") Long id);

			/**
			* 新增数据
			*
			* @param comActAcidCheckRecordVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActAcidCheckRecord")
			R insertComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);

			/**
			* 修改数据
			*
			* @param comActAcidCheckRecordVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActAcidCheckRecord/update")
			R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);

			@GetMapping("/bcRegion/levelList")
			R levelList(@RequestParam("level")Integer level,@RequestParam("code")String code);

			@GetMapping("/bcRegion/levelListBackstage")
			R levelListBackstage();

			/**
			* 单位活动统计
			*/
			@GetMapping("/neighbor/activityAnalysis")
			R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
			@RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
			@RequestParam(value = "page",required = false) Integer page,
			@RequestParam(value = "size",required = false) Integer size,
			@RequestParam(value = "belongTo",required = false) String belongTo,
			@RequestParam(value = "unitId",required = false) Long unitId,@RequestParam(value = "loginAccount",required = false) String loginAccount);
			/**
			* 批量删除活动
			* @param ids
			* @return
			*/
			@PostMapping("batchDel")
			R deleteActivities(@RequestBody List<Long> ids);

			/**
			* 街道详情
			* @param id
			* @return
			*/
			@GetMapping("detailStreet")
			R detailStreet(@RequestParam("id") Long id);

			/**
			* 分页查询项目报名列表
			* @param pageProjectSignListDTO
			* @return
			*/
			@PostMapping("/comActSocialProject/signList")
			R pageProjectSignList(@RequestBody PageProjectSignListDTO pageProjectSignListDTO);

			/**
			* 分页查询孵化申请
			* @param pageHatchAuditDTO
			* @return
			*/
			@PostMapping("/comActSocialOrgHatchAudit/page")
			R pageHatchAudit(@RequestBody PageSocialOrgHatchAuditDTO pageHatchAuditDTO);

			/**
			* 查看孵化申请详情
			* @param id
			* @return
			*/
			@GetMapping("/comActSocialOrgHatchAudit/detail")
			R detailHatchAudit(@RequestParam("id") Long id);

			/**
			* 修改孵化申请
			* @param hatchAuditDTO
			* @return
			*/
			@PostMapping("/comActSocialOrgHatchAudit/update")
			R updateHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO);

			/**
			* 分页查询孵化数据
			* @param pageHatchDTO
			* @return
			*/
			@PostMapping("/comActSocialOrgHatch/page")
			R pageOrgHatch(@RequestBody PageSocialOrgHatchDTO pageHatchDTO);

			/**
			* 查看孵化数据详情
			* @param id
			* @return
			*/
			@GetMapping("/comActSocialOrgHatch/detail")
			R detailOrgHatch(@RequestParam("id") Long id);

			/**
			* 修改孵化状态
			* @param id
			* @param status
			* @return
			*/
			@PutMapping("/comActSocialOrgHatch/updateStatus")
			R updateOrgHatchStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

			/**
			* 获取孵化流程配置
			* @return
			*/
			@GetMapping("/comActSocialOrgHatchAudit/process")
			R getHatchAuditProcess();

			/**
			* 修改孵化流程配置
			* @param processDTO
			* @return
			*/
			@PutMapping("/comActSocialOrgHatchAudit/process")
			R putHatchAuditProcess(@RequestBody HatchAuditProcessDTO processDTO);

			/**
			* 新增孵化申请
			* @param hatchAuditDTO
			* @return
			*/
			@PostMapping("/comActSocialOrgHatchAudit/add")
			R addHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO);

			/**
			* 查看孵化申请审核进度
			* @param userId
			* @return
			*/
			@GetMapping("/comActSocialOrgHatchAudit/schedule")
			R getHatchAuditSchedule(@RequestParam("userId") Long userId);

			/**
			* 项目公开报名
			* @param projectId
			* @param userId
			* @return
			*/
			@GetMapping("/comActSocialProject/sign")
			R signProject(@RequestParam("projectId") Long projectId, @RequestParam("userId") Long userId);

			/**
			* 分页查询用户报名的项目
			* @param pageProjectDTO
			* @return
			*/
			@PostMapping("/comActSocialProject/project")
			R pageProjectWhichIsSignedByUser(@RequestBody PageProjectDTO pageProjectDTO);

			/**
			* 删除孵化申请详情
			* @param id
			* @return
			*/
			@GetMapping("/comActSocialOrgHatchAudit/delete")
			R deleteHatchAudit(@RequestParam("id") Long id);

			/**
			* 删除孵化数据
			* @param id
			* @return
			*/
			@GetMapping("/comActSocialOrgHatch/delete")
			R deleteOrgHatch(@RequestParam("id") Long id);

			/**
			* 新增社区企业
			* @param addEnterpriseDTO
			* @return
			*/
			@PostMapping("/enterprise/add")
			R addEnterprise(@RequestBody AddEnterpriseDTO addEnterpriseDTO);

			/**
			* 修改社区企业
			* @param editEnterpriseDTO
			* @return
			*/
			@PostMapping("/enterprise/edit")
			R editEnterprise(@RequestBody EditEnterpriseDTO editEnterpriseDTO);

			/**
			* 删除社区企业
			* @param id
			* @return
			*/
			@DeleteMapping("/enterprise/delete")
			R deleteEnterprise(@RequestParam("id") Long id);

			/**
			* 获取社区企业详情
			* @param id
			* @return
			*/
			@GetMapping("/enterprise/detail")
			R detailEnterprise(@RequestParam("id") Long id);

			/**
			* 分页查询社区企业
			* @param pageEnterpriseDTO
			* @return
			*/
			@PostMapping("/enterprise/page")
			R pageEnterprise(@RequestBody PageEnterpriseDTO pageEnterpriseDTO);

			/**
			* 孵化中心-基础数据
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/hatch/base")
			R getHatchBaseData(@RequestParam("communityId") Long communityId);

			/**
			* 孵化中心-孵化成果展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/hatchResult/list")
			R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 孵化中心-孵化进度展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/hatchSchedule/list")
			R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 五社联动基础数据
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/fiveAssociations/base")
			R getFiveAssociationsBaseData(@RequestParam("communityId") Long communityId);

			/**
			* 五社联动项目展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/socialProject/list")
			R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 五社联动社会组织展示列表
			* @param pageBaseDTO
			* @return
			*/
			@PostMapping("/screen/socialOrg/list")
			R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 新增服务分类
			* @param addEnterpriseTypeDTO
			* @return
			*/
			@PostMapping("/enterpriseType/add")
			R addEnterpriseType(@RequestBody AddEnterpriseTypeDTO addEnterpriseTypeDTO);

			/**
			* 修改服务分类
			* @param enterpriseTypeDTO
			* @return
			*/
			@PostMapping("/enterpriseType/edit")
			R editEnterpriseType(@RequestBody EditEnterpriseTypeDTO enterpriseTypeDTO);

			/**
			* 删除服务分类
			* @param id
			* @return
			*/
			@DeleteMapping("/enterpriseType/delete")
			R deleteEnterpriseType(@RequestParam("id") Long id);

			/**
			* 获取服务分类详情
			* @param id
			* @return
			*/
			@GetMapping("/enterpriseType/detail")
			R detailEnterpriseType(@RequestParam("id") Long id);
			/**
			* 分页查询服务分类
			* @param pageEnterpriseTypeDTO
			* @return
			*/
			@PostMapping("/enterpriseType/page")
			R pageEnterpriseType(@RequestBody PageEnterpriseTypeDTO pageEnterpriseTypeDTO);

			/**
			* 获取服务分类列表
			* @param communityId
			* @return
			*/
			@GetMapping("/enterpriseType/list")
			R getEnterpriseTypeList(@RequestParam("communityId") Long communityId);

			/**
			* 新增人大代表
			* @param addDpcDTO
			* @return
			*/
			@PostMapping("/dpc/add")
			R addDpc(@RequestBody AddDpcDTO addDpcDTO);

			/**
			* 修改人大代表
			* @param editDpcDTO
			* @return
			*/
			@PostMapping("/dpc/edit")
			R editDpc(@RequestBody EditDpcDTO editDpcDTO);

			/**
			* 删除人大代表
			* @param id
			* @return
			*/
			@DeleteMapping("/dpc/delete")
			R deleteDpc(@RequestParam("id") Long id);

			/**
			* 获取人大代表详情
			* @param id
			* @return
			*/
			@GetMapping("/dpc/detail")
			R detailDpc(@RequestParam("id") Long id);

			/**
			* 分页查询人大代表
			* @param pageDpcDTO
			* @return
			*/
			@PostMapping("/dpc/page")
			R pageDpc(@RequestBody PageDpcDTO pageDpcDTO);

			/**
			* 获取人大代表反馈记录
			* @param id
			* @return
			*/
			@GetMapping("/dpc/feedback")
			R getFeedbackList(@RequestParam("id") Long id);

			/**
			* 人大代表反馈随手拍
			* @param comActEasyPhotoVO
			* @return
			*/
			@PostMapping("/dpc/feedback")
			R addEasyPhotoFeedbackForDpc(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

			/**
			* 人大代表
			* @param communityId
			* @return
			*/
			@GetMapping("/screen/dpc/base")
			R dpcBase(@RequestParam("communityId") Long communityId);

			/**
			* 人大代表-随手拍展示列表
			* @return
			*/
			@PostMapping("/screen/dpc/easyPhotoList")
			R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 查询详情
			* @param id
			* @return
			*/
			@GetMapping("/comActEasyPhotoHandler/detail")
			R detailEasyPhotoHandler(@RequestParam("id") Long id);

			/**
			* 活动邀请列表
			* @param pageActivityInviteDTO
			* @return
			*/
			@PostMapping("/activity/invite/list")
			R pageActivityInviteList(@RequestBody PageActivityInviteDTO pageActivityInviteDTO);

			/**
			* 添加邀请人员
			* @param list
			* @return
			*/
			@PostMapping("/activity/invite/add")
			R activityInviteAdd(@RequestBody List<ActivityInviteDTO> list);

			/**
			* 删除邀请人员
			* @param id
			* @return
			*/
			@DeleteMapping("/activity/invite/delete")
			R activityInviteDelete(@RequestParam("id") Long id);

			/**
			* 获取积分详情
			* @param id
			* @return
			*/
			@GetMapping("/integral/user/detail")
			R getUserIntegralDetail(@RequestParam("id") Long id);

			/**
			* 分页查询可关联清单列表
			* @param neighborCircleAppDTO
			* @return
			*/
			@PostMapping("/neighbor/pageRelationList")
			R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

			/**
			* 投票情况-分页查询
			* @param pageVoteSituationDTO
			* @return
			*/
			@PostMapping("pageVoteSituation")
			R pageVoteSituation(@RequestBody PageVoteSituationDTO pageVoteSituationDTO);

			/**
			* 投票情况详情
			* @param optionUserId
			* @return
			*/
			@GetMapping("detailVoteSituation")
			R detailVoteSituation(@RequestParam("optionUserId") Long optionUserId);

			/**
			* 批量核对防疫信息数据
			* @param batchCheckAcidRecordDTO
			* @return
			*/
			@PostMapping("/comActAcidRecord/batchCheck")
			R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
			}