java/zhihuishenqu.git

			@@ -2,11 +2,51 @@

			import java.util.List;

			import com.panzhihua.common.model.dtos.PageBaseDTO;
			import com.panzhihua.common.model.dtos.civil.*;
			import com.panzhihua.common.model.dtos.common.*;
			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.building.admin.*;
			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;
			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.neighbor.*;
			import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
			import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
			import com.panzhihua.common.model.vos.*;
			import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
			import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
			import com.panzhihua.common.model.vos.community.*;
			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 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 com.panzhihua.common.model.vos.community.social.*;
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiImplicitParams;
			import io.swagger.annotations.ApiOperation;
			import com.panzhihua.common.model.vos.community.*;
			import org.springframework.beans.BeanUtils;
			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;
			@@ -16,9 +56,106 @@
			import org.springframework.web.bind.annotation.RequestParam;

			import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
			import com.panzhihua.common.model.dtos.PageBaseDTO;
			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;
			import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
			import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
			import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO;
			import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
			import com.panzhihua.common.model.dtos.community.ComActDiscussOptionUserDTO;
			import com.panzhihua.common.model.dtos.community.ComActDiscussUserDTO;
			import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
			import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
			import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
			import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
			import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
			import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
			import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
			import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
			import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
			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;
			import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
			import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordEditDTO;
			import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
			import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
			import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
			import com.panzhihua.common.model.dtos.community.ComSwSafetyWorkEditDTO;
			import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
			import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
			import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
			import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO;
			import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO;
			import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO;
			import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
			import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
			import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
			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;
			import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
			import com.panzhihua.common.model.dtos.community.PageComActDTO;
			import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
			import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
			import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
			import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
			import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
			import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
			import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
			import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
			import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
			import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
			import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO;
			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;
			import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
			import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
			import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
			import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
			import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
			import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
			import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
			import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
			@@ -28,25 +165,128 @@
			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.PageClusterMemberDto;
			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;
			import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO;
			import com.panzhihua.common.model.dtos.community.convenient.DeleteConvenientProductDTO;
			import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.OnShelfOrOffShelfProductDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductCategoryDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
			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.reserve.*;
			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;
			import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
			import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
			import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
			import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
			import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
			import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
			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.ComActWarehouseApplyDTO;
			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;
			@@ -63,6 +303,23 @@
			import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
			import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
			import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
			import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborAddBrowseAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentReplyAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborFabulousAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborForwardAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborReplyAppDTO;
			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;
			@@ -92,17 +349,103 @@
			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.civil.ComActSocialWorkerVO;
			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.cluster.admin.ComClusterMemberExcelVO;
			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.reserve.*;
			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.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;
			@@ -119,7 +462,7 @@
			* @author: huang.hongfa weixin hhf9596 qq 959656820
			* @create: 2020-12-07 15:59
			**/
			@FeignClient(name = "community")
			@FeignClient(name = "huacheng-community")
			public interface CommunityService {
			/**
			* 新增社区活动
			@@ -191,7 +534,7 @@
			* @return 详情
			*/
			@PostMapping("detailactivity")
			R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);
			R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId,@RequestParam(value = "pageNum", required = false) Long pageNum,@RequestParam(value = "pageSize", required = false) Long pageSize);

			/**
			* 分页活动报名名单
			@@ -282,6 +625,15 @@
			*/
			@GetMapping("/activity/picture/getList")
			R getPictureList(@RequestParam("userId") Long userId);

			/**
			* 获取系统预置图库 getSysPictureList
			* @return R 系统图库集
			* @author txb
			* @date 2021/8/27 13:33
			*/
			@GetMapping("/activity/sysPicture/getList")
			R getSysPictureList(@RequestParam("type")Integer type);

			/**
			* 活动报名名单
			@@ -396,6 +748,16 @@
			*/
			@PostMapping("pagemicrowish")
			R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);

			/**
			* 小程序分页查询微心愿
			*
			* @param comActMicroWishVO
			* 查询参数
			* @return 分页集合
			*/
			@PostMapping("pagemicrowish/applets")
			R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO);

			/**
			* 心愿详情
			@@ -674,7 +1036,7 @@
			* @return 类型列表
			*/
			@PostMapping("listbuildtype")
			R listBuildType();
			R listBuildType(@RequestParam("communityId")Long communityId);

			/**
			* 分页查询其他建筑
			@@ -833,10 +1195,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);

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

			/**
			* 首页广告banner
			@@ -1141,12 +1504,20 @@
			/**
			* 议事投票-详情
			*
			* @param id
			* 主键
			* @param discussDetailDTO
			* 请求参数
			* @return ComActDiscussVO
			*/
			@PostMapping("detaildiscuss")
			R detailDiscuss(@RequestParam("id") Long id);
			R detailDiscuss(@RequestBody ComActDiscussDetailDTO discussDetailDTO);

			/**
			* 分页查询评论下回复列表
			* @param discussDetailDTO 请求参数
			* @return 回复列表
			*/
			@PostMapping("discussCommentReplyAdmin")
			R discussCommentReplyAdmin(@RequestBody ComActDiscussDetailDTO discussDetailDTO);

			/**
			* 议事投票-删除
			@@ -1179,6 +1550,16 @@
			R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

			/**
			* 议事投票-后台分页查询
			*
			* @param pageComActDiscussDTO
			* 查询参数
			* @return ComActDiscussVO
			*/
			@PostMapping("pagediscussAdmin")
			R pageDiscussAdmin(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

			/**
			* 议事投票-评论-查看
			*
			* @param id
			@@ -1187,6 +1568,14 @@
			*/
			@PostMapping("detaildiscusscomment")
			R detailDiscussComment(@RequestParam("id") Long id);

			/**
			* 议事投票评论详情
			* @param pageComActDiscussCommentDTO 请求参数
			* @return 议事投票详情
			*/
			@PostMapping("detaildiscusscommentAdmin")
			R detailDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

			/**
			* 议事投票-评论-置顶
			@@ -1217,6 +1606,16 @@
			*/
			@PostMapping("pagediscusscomment")
			R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

			/**
			* 议事投票-评论-后台分页查询
			*
			* @param pageComActDiscussCommentDTO
			* 分页查询参数
			* @return ComActDiscussCommentVO
			*/
			@PostMapping("pagediscusscommentAdmin")
			R pageDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

			/**
			* 议事投票-分页查询小程序
			@@ -1903,10 +2302,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);

			/**
			* 分页查询街道
			@@ -2155,6 +2555,56 @@
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入高龄老人 listSavePopulationElderExcelVO 批量导入高龄老人
			* @param list 高龄老人数据
			* @param communityId 社区id
			* @return R 导入结果
			* @author txb
			* @date 2021/9/01 15:03
			*/
			@PostMapping("/common/data/population/importElder")
			R listSavePopulationElderExcelVO(@RequestBody List<ComMngPopulationElderExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入养老金人员 listSavePopulationPensionExcelVO 批量导入养老金人员
			* @param list 养老金人员数据
			* @param communityId 社区id
			* @return R 导入结果
			* @author txb
			* @date 2021/9/01 15:03
			*/
			@PostMapping("/common/data/population/importPension")
			R listSavePopulationPensionExcelVO(@RequestBody List<ComMngPopulationPensionExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入高龄老人线下认证记录 listSaveElderAuthRecordExcelVO 批量导入高龄老人线下认证记录
			* @param list 高龄老人线下认证记录数据
			* @param communityId 社区id
			* @param userId 登录人id
			* @return R 导入结果
			* @author txb
			* @date 2021/9/01 15:03
			*/
			@PostMapping("/elders/authRecords/underLine/import")
			R listSaveElderAuthRecordExcelVO(@RequestBody List<ComElderAuthRecordImportExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入养老线下认证记录 listSavePensionAuthRecordExcelVO 批量导入养老线下认证记录
			* @param list 养老线下认证记录数据
			* @param communityId 社区id
			* @param userId 登录人id
			* @return R 导入结果
			* @author txb
			* @date 2021/9/01 15:03
			*/
			@PostMapping("/elders/pensionAuthRecords/underLine/import")
			R listSavePensionAuthRecordExcelVO(@RequestBody List<ComPensionAuthRecordImportExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 确认导入实有人口（有则更新，无则新建）
			*
			* @param list
			@@ -2178,6 +2628,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
			@@ -2185,7 +2652,7 @@
			* @return 实有人口详细信息
			*/
			@PostMapping("/common/data/population/detail")
			R<ComMngPopulationVO> detailPopulation(@RequestParam(value = "populationId") Long populationId);
			R<ComMngPopulationVO> detailPopulation(@RequestParam(value = "populationId") Long populationId, @RequestParam(value = "communityId") Long communityId);

			/**
			* 根据id查询实有人口电子档案信息
			@@ -2210,12 +2677,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查询所有实有人口
			@@ -2911,7 +3378,7 @@
			* @return 删除结果
			*/
			@PostMapping("common/data/special/delete")
			R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
			R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam("communityId") Long communityId);

			/**
			* 办事指南_新增
			@@ -2960,6 +3427,45 @@
			*/
			@PostMapping("/delectworkguide")
			R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);

			/**
			* 分页查询办事指南-分类管理 pageWorkGuideClassify 分页查询办事指南-分类管理
			* @param comActWorkGuideClassifyVO 查询参数
			* @return R 返回结果
			* @author txb
			* @date 2021/8/31 15:03
			*/
			@PostMapping("/workGuide/classify/apage")
			R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);

			/**
			* 办事指南-分类管理新增或修改 addWorkGuideClassify 办事指南-分类管理新增或修改
			* @param comActWorkGuideClassifyVO 新增或修改参数
			* @return R 返回结果
			* @author txb
			* @date 2021/8/31 15:03
			*/
			@PostMapping("/workGuide/classify/add")
			R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);

			/**
			* 办事指南-分类管理删除 deleteWorkGuideClassify 办事指南-分类管理删除
			* @param workGuideClassifyId 办事指南-分类管理id
			* @return R 返回结果
			* @author txb
			* @date 2021/8/31 15:03
			*/
			@GetMapping("/workGuide/classify/delete")
			R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId);

			/**
			* 办事指南-分类管理列表查询 getWorkGuideClassifyList 办事指南-分类管理列表查询
			* @return R 返回结果
			* @author txb
			* @date 2021/8/31 15:03
			*/
			@GetMapping("/workGuide/classify/getList")
			R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode);

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

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

			/**
			* 实有房屋统计
			*
			* @param communityId
			@@ -3404,6 +3920,157 @@
			*/
			@PostMapping("/eldersauth/addFeedback")
			R addFeedback(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO);

			//2021-8-30 身份认证改版（高龄老人认证管理）接口
			/**
			* 分页查询高龄老人认证记录 pageElderAuthRecords 分页查询高龄老人认证记录
			* @param pageElderAuthRecordsDTO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/9/02 11:03
			*/
			@PostMapping("/elders/authRecords/page")
			R pageElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);

			/**
			* 根据高龄认证记录id查询详情 detailElderAuthRecords 根据高龄认证记录id查询详情
			* @param authRecordId 高龄认证记录id
			* @return R 查询结果
			* @author txb
			* @date 2021/9/02 11:03
			*/
			@GetMapping("/elders/authRecords/detail")
			R detailElderAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId);

			/**
			* 高龄认证审核 examineElderAuthRecords 高龄认证审核
			* @param comElderAuthRecordVO 高龄认证审核参数
			* @return R 查询结果
			* @author txb
			* @date 2021/9/02 11:03
			*/
			@PostMapping("/elders/authRecords/examine")
			R examineElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);

			/**
			* 高龄认证标记 examineElderAuthRecords 高龄认证标记
			* @param comElderAuthRecordVO 高龄认证标记参数
			* @return R 查询结果
			* @author txb
			* @date 2021/9/02 11:03
			*/
			@PostMapping("/elders/authRecords/sign")
			R signElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);

			/**
			* 根据高龄认证记录id批量查询 getElderAuthRecordsByIds 根据高龄认证记录id批量查询
			* @param ids 高龄认证记录id集合
			* @return R 查询结果
			* @author txb
			* @date 2021/9/02 11:03
			*/
			@PostMapping("/elders/authRecords/getList")
			R getElderAuthRecordsByIds(@RequestBody List<Long> ids);

			/**
			* 导出高龄认证统计记录 exportElderAuthRecordsStatistic
			* @param pageElderAuthRecordsDTO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/9/02 11:03
			*/
			@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 分页查询养老金人员认证记录
			* @param pageElderAuthRecordsDTO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/9/07 14:03
			*/
			@PostMapping("/elders/pensionAuthRecords/page")
			R pagePensionAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);

			/**
			* 根据养老认证记录id查询详情 detailPensionAuthRecords 根据养老认证记录id查询详情
			* @param authRecordId 养老认证记录id
			* @return R 查询结果
			* @author txb
			* @date 2021/9/07 11:03
			*/
			@GetMapping("/elders/pensionAuthRecords/detail")
			R detailPensionAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId);

			/**
			* 养老认证审核 examinePensionAuthRecords 养老认证审核
			* @param comPensionAuthRecordVO 养老认证审核参数
			* @return R 查询结果
			* @author txb
			* @date 2021/9/07 11:03
			*/
			@PostMapping("/elders/pensionAuthRecords/examine")
			R examinePensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO);

			/**
			* 养老认证标记 signPensionAuthRecords 养老认证标记
			* @param comPensionAuthRecordVO 养老认证标记参数
			* @return R 查询结果
			* @author txb
			* @date 2021/9/02 11:03
			*/
			@PostMapping("/elders/pensionAuthRecords/sign")
			R signPensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO);

			/**
			* 根据养老认证记录id批量查询 getPensionAuthRecordsByIds 根据养老认证记录id批量查询
			* @param ids 养老认证记录id集合
			* @return R 查询结果
			* @author txb
			* @date 2021/9/02 11:03
			*/
			@PostMapping("/elders/pensionAuthRecords/getList")
			R getPensionAuthRecordsByIds(@RequestBody List<Long> ids);

			/**
			* 导出养老认证记录 exportPensionAuthRecordsStatistic 导出养老认证记录
			* @param pageElderAuthRecordsDTO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/9/02 11:03
			*/
			@PostMapping("/elders/pensionAuthRecords/statistic/export")
			R exportPensionAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);

			/**
			* 查询养老认证社区认证方式 setPensionAuthType 查询养老认证社区认证方式
			* @param eldersAuthTypeQueryDTO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/9/10 16:03
			*/
			@PostMapping("/elders/pensionAuthRecords/authtype")
			R communityPensionAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);

			/**
			* 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验） setPensionAuthType 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验）
			* @param communityId 社区id
			* @param type 检验类型
			* @return R 设置结果
			* @author txb
			* @date 2021/9/10 16:03
			*/
			@PutMapping("/elders/pensionAuthRecords/authType/{type}")
			R setPensionAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);

			/**
			* 小程序-查询疫苗分类列表
			@@ -3553,7 +4220,7 @@
			* @param eldersAuthTypeQueryDTO
			* @return
			*/
			@PostMapping("/elders/authtype")
			@PostMapping("/elders/authType")
			R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);

			/**
			@@ -4390,12 +5057,19 @@
			/**
			* 小程序查询邻里圈话题列表
			*
			* @param communityId
			* 社区id
			* @return 邻里圈话题列表
			*/
			@GetMapping("/neighbor/getNeighborTopicByApp")
			R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero);
			R getNeighborTopicByApp(@RequestParam("name") String name);

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

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

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

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

			/**
			* 分页查询退役军人列表
			@@ -4529,6 +5219,16 @@
			R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);

			/**
			* 编辑巡查记录 editPatrolRecord 编辑巡查记录
			* @param comSwPatrolRecordEditDTO 编辑巡查记录参数
			* @return R 编辑结果
			* @author txb
			* @date 2021/9/08 17:03
			*/
			@PostMapping("/patrolRecord/edit")
			R editPatrolRecord(@RequestBody ComSwPatrolRecordEditDTO comSwPatrolRecordEditDTO);

			/**
			* 根据巡查记录id查询详情
			*
			* @param patrolRecordId
			@@ -4547,6 +5247,16 @@
			*/
			@PostMapping("/patrolRecord/safetyWorkRecord/page")
			R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

			/**
			* 编辑安全工作记录 editSafetyWork 编辑安全工作记录
			* @param comSwSafetyWorkEditDTO 编辑安全工作记录参数
			* @return R 编辑结果
			* @author txb
			* @date 2021/9/08 17:03
			*/
			@PostMapping("/patrolRecord/safetyWorkRecord/edit")
			R editSafetyWork(@RequestBody ComSwSafetyWorkEditDTO comSwSafetyWorkEditDTO);

			/**
			* 根据安全工作记录id查询详情
			@@ -4579,6 +5289,16 @@
			*/
			@PostMapping("/patrolRecord/dangerReport/page")
			R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

			/**
			* 编辑隐患报告 editDangerReport 编辑隐患报告
			* @param comSwDangerReportEditDTO 编辑隐患报告参数
			* @return R 编辑结果
			* @author txb
			* @date 2021/9/08 17:03
			*/
			@PostMapping("/patrolRecord/dangerReport/edit")
			R editDangerReport(@RequestBody ComSwDangerReportEditDTO comSwDangerReportEditDTO);

			/**
			* 根据隐患报告id查询详情
			@@ -4728,11 +5448,11 @@
			R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);

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

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

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

			/**
			* 根据名字查询所有社区列表
			@@ -4830,7 +5550,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);

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

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

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

			/**
			* 社区后台-根据社区id统计预约类数据
			@@ -5130,12 +5852,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
			@@ -5151,6 +5883,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);

			/**
			* 查询登记详情记录
			@@ -5214,8 +5954,32 @@
			* @param circleTopicAppDTO 请求参数
			* @return 删除结果
			*/
			@PostMapping("/neighbor/circleTopicAppDTO")
			@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);


			/**
			* 获取系统配置value
			@@ -5245,4 +6009,4279 @@
			*/
			@GetMapping("/sys/conf/editSysConfValue")
			R editSysConfValue(@RequestParam("communityId") Long communityId,@RequestParam("status") Integer status);

			/**
			* 议事投票后台公布结果
			* @param publishResultDTO 请求参数
			* @return 公布结果
			*/
			@PostMapping("publishResultAdmin")
			R publishResultAdmin(@RequestBody ComActDiscussPublishResultDTO publishResultDTO);

			/**
			* 议事投票-评论/回复删除
			* @param id 评论/回复id
			* @return 删除结果
			*/
			@GetMapping("deleteDiscussCommentAdmin")
			R deleteDiscussCommentAdmin(@RequestParam("id") Long id);

			/**
			* 查询社区可发布议事投票权限配置
			* @param communityId 社区id
			* @return 社区可发布议事投票权限配置
			*/
			@GetMapping("discussJurisdictionGet")
			R discussJurisdictionGet(@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);

			/**
			* 设置当前社区议事投票小程序身份验证参数(1.全部 2.党员 3.志愿者 4.社区工作人员)
			* @param communityId 社区id
			* @param value 需要设置的参数值
			* @return 设置结果
			*/
			@GetMapping("discussJurisdictionSet")
			R discussJurisdictionSet(@RequestParam("communityId") Long communityId, @RequestParam("value") String value);

			/**
			* 议事投票检测状态定时任务
			* @return 执行结果
			*/
			@GetMapping("timedTaskDiscussInspectStatus")
			R timedTaskDiscussInspectStatus();

			/**
			* 一起议增加浏览量
			* @param discussId 一起议主键id
			*/
			@PostMapping("discuss/increase-view-num")
			void increaseViewNum(@RequestParam("discussId") Long discussId);

			/**
			* 定时任务每半小时执行一次将一起议浏览量写入到表中
			*/
			@PostMapping("discuss/write-view-num")
			R timedTaskWriteDiscussViewNumToTable();

			/**
			* 公布/编辑一起议投票结果
			* @param comActDiscussDTO
			* @return 请求结果
			*/
			@PostMapping("discuss/edit-result")
			R editDiscussResult(@RequestBody ComActDiscussDTO comActDiscussDTO);

			/**
			* 定时任务扫描高龄认证记录信息
			* @return 执行结果
			*/
			@PostMapping("/elders/auth/task")
			R timedTaskEldersAuthJobHandler();

			/**
			* 身份认证定时任务
			* @return 执行结果
			*/
			@PostMapping("/elders/auth/record/task")
			R timedTaskEldersAuthRecordJobHandler();

			/**
			* 身份认证定时任务
			* @return 执行结果
			*/
			@PostMapping("/elders/authRecords/statistics")
			R timedTaskElderAuthStatisticsJobHandler();

			/**
			* 定时任务每年3月1号0点统计养老认证本期应该认证总人数
			* @return 执行结果
			*/
			@PostMapping("/elders/pensionAuthRecords/statistics")
			R timedTaskPensionAuthStatisticsJobHandler();

			/**
			* 办事指南列表-按分类查询
			* @param pageActWorkGuideDTO 请求参数
			* @return 办事指南分类列表
			*/
			@PostMapping("/listworkguide")
			R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);

			/**
			* 根据办事指南分类id查询办事指南列表
			* @param classifyId 办事指南分类id
			* @return 办事指南列表数据
			*/
			@GetMapping("/listworkguide/classify")
			R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId);

			/**
			* 小程序查询所有进行中的预约登记
			* @param communityId 社区id
			* @return 社区所有进行中的预约登记列表
			*/
			@GetMapping("/reserve/list")
			R reserveListApplets(@RequestParam("communityId") Long communityId);

			/**
			* 查询社区高龄认证方式（1.视频认证 2.人脸核验）
			* @param eldersAuthTypeQueryDTO 请求参数
			* @return 社区高龄认证方式（1.视频认证 2.人脸核验）
			*/
			@PostMapping("/elders/new/authtype")
			R communityEldersAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);

			/**
			* 设置当前社区高龄认证方式:核验类型（1.视频认证 2.人脸核验）
			* @param communityId 社区id
			* @param type 检验类型
			* @return R 设置结果
			*/
			@PutMapping("/elders/new/authType/{type}")
			R setEldersAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);

			/**
			* 新增身份认证
			* @param addIdentityAuthDTO 新增身份认证请求参数
			* @return 新增结果结果
			*/
			@PostMapping("/identity-auth/add")
			R addIdentityAuth(@RequestBody AddIdentityAuthDTO addIdentityAuthDTO);

			/**
			* 分页查询身份认证记录
			* @param pageIdentityAuthRecordDTO 分页查询身份认证记录参数
			* @return 身份认证记录列表
			*/
			@PostMapping("/identity-auth/record/page")
			R queryRecordWithPage(@RequestBody PageIdentityAuthRecordDTO pageIdentityAuthRecordDTO);

			/**
			* 获取身份认证详情
			* @param authType 认证类型
			* @param identityAuthId 认证id
			* @return 认证记录详情
			*/
			@GetMapping("/identity-auth/detail")
			R retrieveIdentityAuthDetail(@RequestParam("authType") Integer authType,
			@RequestParam("identityAuthId") Long identityAuthId);

			/**
			* 获取身份认证方式
			* @param communityId
			* @param identityAuthType
			* @return 认证方式
			*/
			@GetMapping("/identity-auth/mode")
			R getIdentityAuthMode(@RequestParam(value = "communityId") Long communityId,
			@RequestParam(value = "identityAuthType") Integer identityAuthType);

			/**
			* 获取身份认证人脸核验token
			* @param getIdentityEidTokenDTO
			* @return token
			*/
			@PostMapping("/identity-auth/getEidToken")
			R getEidToken(@RequestBody GetIdentityEidTokenDTO getIdentityEidTokenDTO);

			/**
			* 一起议获取是否有发布权
			* @param comActDiscussDTO
			* @return
			*/
			@PostMapping("discuss/permissions")
			R getDiscussPermissions(@RequestBody ComActDiscussDTO comActDiscussDTO);

			/**
			* 高龄认证统计-分页查询
			* @param pageElderAuthStatisticDTO 请求参数
			* @return 高龄认证统计列表
			*/
			@PostMapping("/elders/auth/statistic/page")
			R pageAuthStatisticAdmin(@RequestBody PageElderAuthStatisticDTO pageElderAuthStatisticDTO);

			/**
			* 高龄认证统计-标记
			* @param signElderAuthStatisticDTO 请求参数
			* @return 标记结果
			*/
			@PostMapping("/elders/auth/statistic/sign")
			R signAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO);

			/**
			* 高龄认证统计-统计表头数据
			* @param statisticHeaderDTO 请求参数
			* @return 统计表头数据
			*/
			@PostMapping("/elders/auth/header/statistic")
			R getAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO);

			/**
			* 养老认证统计-分页查询
			* @param pensionAuthStatisticDTO 请求参数
			* @return 养老认证统列表
			*/
			@PostMapping("/elders/pension/auth/statistic/page")
			R pagePensionAuthStatisticAdmin(@RequestBody PagePensionAuthStatisticDTO pensionAuthStatisticDTO);

			/**
			* 养老认证记标记
			* @param signElderAuthStatisticDTO 请求参数
			* @return 标记结果
			*/
			@PostMapping("/elders/pension/auth/statistic/sign")
			R signPensionAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO);

			/**
			* 养老认证表头统计
			* @param statisticHeaderDTO 请求参数
			* @return 统计结果
			*/
			@PostMapping("/elders/pension/auth/header/statistic")
			R getPensionAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO);

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

			/**
			* 新增数据
			*
			* @param comActSocialOrg 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActSocialOrg")
			R comActSocialOrgInsert(@RequestBody ComActSocialOrgVO comActSocialOrg);

			/**
			* 修改数据
			*
			* @param comActSocialOrg 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActSocialOrg/update")
			R comActSocialOrgUpdate(@RequestBody ComActSocialOrgVO comActSocialOrg);

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

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comActCommittee/queryAll")
			R comActCommitteeSelectAll(@RequestBody CommonPage commonPage);
			/**
			* 新增数据
			*
			* @param comActCommittee 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActCommittee")
			R comActCommitteeInsert(@RequestBody ComActCommiteeVO comActCommittee);
			/**
			* 修改数据
			*
			* @param comActCommittee 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActCommittee/update")
			R comActCommitteeUpdate(@RequestBody ComActCommiteeVO comActCommittee);

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

			/**
			* 分页查询所有数据
			*
			* @param commonPage 查询实体
			* @return 所有数据
			*/
			@PostMapping("/comProperty/queryAll")
			R comPropertySelectAll(@RequestBody CommonPage commonPage);
			/**
			* 新增数据
			*
			* @param comPropertyVO 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comProperty")
			R comPropertyInsert(@RequestBody ComPropertyVO comPropertyVO);
			/**
			* 修改数据
			*
			* @param comPropertyVO 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comProperty/update")
			R comPropertyUpdate(@RequestBody ComPropertyVO comPropertyVO);

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

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

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

			/**
			* 新增数据
			*
			* @param comActFourMember 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActFourMember")
			R comActFourMemberInsert(@RequestBody ComActFourMemberVO comActFourMember);

			/**
			* 修改数据
			*
			* @param comActFourMember 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActFourMember/update")
			R comActFourMemberUpdate(@RequestBody ComActFourMemberVO comActFourMember);

			/**
			* 删除数据
			*
			* @param comActFourMember 主键结合
			* @return 删除结果
			*/
			@PostMapping("/comActFourMember/del")
			R comActFourMemberDelete(@RequestBody ComActFourMemberVO comActFourMember);

			/**
			* 楼栋查询
			* @param communityId
			* @return
			*/
			@GetMapping("/building/query")
			R comActFourMemberQueryBuilding(@RequestParam("communityId")Long communityId);

			/**
			* 查询房屋二级级联菜单
			*
			* @param cascadeHouseDTO
			* 请求参数
			* @return 菜单列表
			*/
			@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);

			/**
			* 微心愿处理人列表
			* @param communityId 社区id
			* @param type 处理人类型（1.后台用户 2.党员 3.志愿者）
			* @return 处理人列表
			*/
			@GetMapping("/wish/handle/list/admin")
			R wishHandleListAdmin(@RequestParam(value = "communityId") Long communityId,@RequestParam("type") Integer type);

			/**
			* 便民服务新增分类
			* @param convenientServiceCategoryDTO
			* @return
			*/
			@PostMapping("/convenient/service-category/add")
			R addServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO);

			/**
			* 便民服务分类编辑
			* @param convenientServiceCategoryDTO
			* @return
			*/
			@PutMapping("/convenient/service-category/put")
			R putServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO);

			/**
			* 便民服务分类删除
			* @param categoryId
			* @return
			*/
			@DeleteMapping("/convenient/service-category/delete")
			R deleteServiceCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);

			/**
			* 获取便民服务分类详情
			* @param categoryId
			* @return
			*/
			@GetMapping("/convenient/service-category/get")
			R getServiceCategory(@RequestParam("categoryId") Long categoryId);

			/**
			* 分页查询便民服务分类
			* @param pageConvenientServiceCategoryDTO
			* @return
			*/
			@PostMapping("/convenient/service-category/page")
			R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO);

			/**
			* 便民服务新增商家
			* @param convenientMerchantDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/add")
			R addMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);

			/**
			* 编辑便民服务商家
			* @param convenientMerchantDTO
			* @return
			*/
			@PutMapping("/convenient/merchant/put")
			R putMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);

			/**
			* 删除便民服务商家
			* @param merchantId
			* @param operator
			* @return
			*/
			@DeleteMapping("/convenient/merchant/delete")
			R deleteMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("operator") Long operator);

			/**
			* 分页查询便民服务商家
			* @param pageConvenientMerchantDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/page")
			R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO);

			/**
			* 获取便民服务商家详情
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/merchant/get")
			R getMerchant(@RequestParam("merchantId") Long merchantId);

			/**
			* 禁用/启用便民服务商家
			* @param disableOrEnableConvenientMerchantDTO
			* @return
			*/
			@PutMapping("/convenient/merchant/disable-or-enable")
			R disableOrEnableMerchant(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);

			/**
			* 重置便民服务商家账号密码
			* @param resetPasswordConvenientMerchantDTO
			* @return
			*/
			@PutMapping("/convenient/merchant/reset-password")
			R resetPasswordMerchant(@RequestBody ResetPasswordConvenientMerchantDTO resetPasswordConvenientMerchantDTO);

			/**
			* 获取所有便民服务分类
			* @return
			*/
			@GetMapping("/convenient/service-category/all")
			R getAllServiceCategories(@RequestParam("areaCode") String areaCode);

			/**
			* 获取用户便民服务商家详情
			* @param account 商家绑定账号
			* @return
			*/
			@GetMapping("/convenient/getUserMerchantInfoByAccount")
			R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);

			/**
			* 获取商便民服务商家信息
			* @param userId
			* @return
			*/
			@GetMapping("/convenient/merchantInfo")
			R<ConvenientMerchantVO> getUserConvenientMerchantInfo(@RequestParam("userId") Long userId);

			/**
			* 新增便民服务产品分类信息
			* @param convenientProductCategoryDTO
			* @return
			*/
			@PostMapping("/convenient/product-category/add")
			R addProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO);

			/**
			* 编辑便民服务产品分类信息
			* @param convenientProductCategoryDTO
			* @return
			*/
			@PutMapping("/convenient/product-category/put")
			R putProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO);

			/**
			* 删除便民服务产品分类信息
			* @param categoryId
			* @param operator
			* @return
			*/
			@DeleteMapping("/convenient/product-category/delete")
			R deleteProductCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);

			/**
			* 获取便民服务产品分类详情
			* @param categoryId
			* @return
			*/
			@GetMapping("/convenient/product-category/get")
			R getProductCategory(@RequestParam("categoryId") Long categoryId);

			/**
			* 分页查询便民服务产品分类信息
			* @param pageConvenientProductCategoryDTO
			* @return
			*/
			@PostMapping("/convenient/product-category/page")
			R pageProductCategory(@RequestBody PageConvenientProductCategoryDTO pageConvenientProductCategoryDTO);

			/**
			* 便民服务商家后台新增产品
			* @param convenientProductDTO
			* @return
			*/
			@PostMapping("/convenient/product/add")
			R addProduct(@RequestBody ConvenientProductDTO convenientProductDTO);

			/**
			* 便民服务商家后台编辑产品
			* @param convenientProductDTO
			* @return
			*/
			@PutMapping("/convenient/product/put")
			R putProduct(@RequestBody ConvenientProductDTO convenientProductDTO);

			/**
			* 便民服务商家后台获取产品详情
			* @param productId
			* @return
			*/
			@GetMapping("/convenient/product/get")
			R getProduct(@RequestParam("productId") Long productId);

			/**
			* 便民服务商家后台分页获取产品信息
			* @param pageConvenientProductDTO
			* @return
			*/
			@PostMapping("/convenient/product/page")
			R pageProduct(@RequestBody PageConvenientProductDTO pageConvenientProductDTO);

			/**
			* 便民服务商家后台删除产品信息
			* @param deleteConvenientProductDTO
			* @return
			*/
			@DeleteMapping("/convenient/product/delete")
			R deleteProduct(@RequestBody DeleteConvenientProductDTO deleteConvenientProductDTO);

			/**
			* 便民服务商家后台上架/下架产品
			* @param onShelfOrOffShelfProductDTO
			* @return
			*/
			@PutMapping("/convenient/product/onShelf-or-offShelf")
			R onShelfOrOffShelfProduct(@RequestBody OnShelfOrOffShelfProductDTO onShelfOrOffShelfProductDTO);

			/**
			* 获取所有产品分类
			* @return
			* @param merchantId
			*/
			@GetMapping("/convenient/product-category/all")
			R getAllProductCategory(@RequestParam("merchantId") Long merchantId);

			/**
			* 获取该社区商家数量大于0的分类
			* @param communityId
			* @return
			*/
			@GetMapping("/convenient/service-category/suitable")
			R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode);

			/**
			* 获取该社区下的热门商家
			* @param pagePopularMerchantDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/popular")
			R getPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);

			/**
			* 分页获取服务类型下商家信息
			* @param pageClassifyMerchantDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/classify")
			R getClassifyMerchants(@RequestBody PageClassifyMerchantDTO pageClassifyMerchantDTO);

			/**
			* 获取商家详情
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/merchant/detail")
			R getMerchantDetail(@RequestParam("merchantId") Long merchantId);

			/**
			* 获取商家产品
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/product/list")
			R getMerchantProduct(@RequestParam("merchantId") Long merchantId);

			/**
			* 获取产品详情
			* @param productId
			* @return
			*/
			@GetMapping("/convenient/product/detail")
			R getProductDetail(@RequestParam("productId") Long productId);

			/**
			* 搜索商家信息
			* @param pageSearchDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/search")
			R pageSearchMerchant(@RequestBody PageSearchDTO pageSearchDTO);

			/**
			* 搜索商品信息
			* @param pageSearchDTO
			* @return
			*/
			@PostMapping("/convenient/product/search")
			R pageSearchProduct(@RequestBody PageSearchDTO pageSearchDTO);

			/**
			* 增加商家店铺咨询量
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/merchant/consult")
			R consultMerchant(@RequestParam("merchantId") Long merchantId);

			/**
			* 增加产品浏览量
			* @param productId
			* @return
			*/
			@GetMapping("/convenient/product/incr-view")
			R incrProductView(@RequestParam("productId") Long productId);

			/**
			* 获取商家导出数据
			* @param exportMerchantDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/export")
			R exportMerchant(@RequestBody ExportMerchantDTO exportMerchantDTO);

			/**
			* 增加商家店铺浏览量
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/merchant/incr-view")
			R incrMerchantView(@RequestParam("merchantId") Long merchantId);

			/**
			* 定时任务每隔半小时将商家浏览量和咨询量总值计入指定商家数据中
			* @return
			*/
			@PostMapping("/convenient/timedTaskWriteDataToMerchantJobHandler")
			R timedTaskWriteDataToMerchantJobHandler();

			/**
			* 获取商家上下架产品数量
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/product/shelf-num")
			R getProductShelfNum(@RequestParam("merchantId") Long merchantId);

			/**
			* 群团组织成员列表-小程序分页查询
			* @param pageClusterMemberDto 请求参数
			* @return 群团组织成员列表
			*/
			@PostMapping("/cluster/member/page/applets")
			R pageClusterMemberApplets(@RequestBody PageClusterMemberDto pageClusterMemberDto);

			/**
			* 群团组织列表-小程序查询社区群团组织列表
			* @param communityId 社区id
			* @return 社区群团组织列表
			*/
			@GetMapping("/cluster/list/applets")
			R listClusterApplets(@RequestParam("communityId") Long communityId);

			/**
			* 分页查询群团组织列表
			* @param pageClusterAdminDto 请求参数
			* @return 群团组织列表
			*/
			@PostMapping("/cluster/page/admin")
			R pageClusterAdmin(@RequestBody PageClusterAdminDto pageClusterAdminDto);

			/**
			* 新增群团组织
			* @param addClusterAdminDto 请求参数
			* @return 新增结果
			*/
			@PostMapping("/cluster/add/admin")
			R addClusterAdmin(@RequestBody AddClusterAdminDto addClusterAdminDto);

			/**
			* 修改群团组织
			* @param editClusterAdminDto 请求参数
			* @return 修改结果
			*/
			@PostMapping("/cluster/edit/admin")
			R editClusterAdmin(@RequestBody EditClusterAdminDto editClusterAdminDto);

			/**
			* 删除群团组织
			* @param id 组织id
			* @return 删除结果
			*/
			@GetMapping("/cluster/delete/admin")
			R deleteClusterAdmin(@RequestParam("id") Long id);

			/**
			* 群团组织详情
			* @param id 组织id
			* @return 群团组织详情
			*/
			@GetMapping("/cluster/detail/admin")
			R detailClusterAdmin(@RequestParam("id") Long id);

			/**
			* 分页查询群团组织成员列表
			* @param pageClusterMemberAdminDto 请求参数
			* @return 群团组织成员列表
			*/
			@PostMapping("/cluster/member/page/admin")
			R pageClusterMemberAdmin(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);

			/**
			* 新增群团组织成员
			* @param addClusterMemberAdminDto 请求参数
			* @return 新增结果
			*/
			@PostMapping("/cluster/member/add/admin")
			R addClusterMemberAdmin(@RequestBody AddClusterMemberAdminDto addClusterMemberAdminDto);

			/**
			* 编辑群团组织成员
			* @param editClusterMemberAdminDto 请求参数
			* @return 编辑结果
			*/
			@PostMapping("/cluster/member/edit/admin")
			R editClusterMemberAdmin(@RequestBody EditClusterMemberAdminDto editClusterMemberAdminDto);

			/**
			* 删除群团组织成员
			* @param id 组织成员id
			* @return 删除结果
			*/
			@GetMapping("/cluster/member/delete/admin")
			R deleteClusterMemberAdmin(@RequestParam("id") Long id);

			/**
			* 群团组织成员详情
			* @param id 组织成员id
			* @return 群团组织成员详情
			*/
			@GetMapping("/cluster/member/detail/admin")
			R detailClusterMemberAdmin(@RequestParam("id") Long id);

			/**
			* 查询系统民族列表
			* @return 民族列表
			*/
			@GetMapping("/cluster/member/nation/list/admin")
			R memberNationListAdmin();

			/**
			* 群团组织成员导入
			* @param list 导入数据
			* @param communityId 社区id
			* @param userId 操作用户id
			* @return 导入结果
			*/
			@PostMapping("/cluster/member/import/admin")
			R importClusterMember(@RequestBody List<ComClusterMemberExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 群团组织导出数据查询
			* @param pageClusterMemberAdminDto 请求参数
			* @return 导出数据结果集
			*/
			@PostMapping("/cluster/member/export/admin")
			R exportClusterMember(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);

			/**
			* 社区后台分页查询微心愿
			* @param comActMicroWishVO 请求参数
			* @return 微心愿列表
			*/
			@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);

			@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);
			/**
			* 批量删除活动
			* @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);
			}