java/zhihuishenqu.git

			@@ -1,17 +1,24 @@
			package com.panzhihua.common.service.community;

			import java.io.Serializable;
			import java.util.Date;
			import java.util.List;

			import com.panzhihua.common.model.dtos.PageBaseDTO;
			import com.panzhihua.common.model.dtos.civil.*;
			import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
			import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
			import com.panzhihua.common.model.dtos.*;
			import com.panzhihua.common.model.dtos.community.*;
			import com.panzhihua.common.model.dtos.community.building.admin.*;
			import com.panzhihua.common.model.dtos.community.acid.*;
			import com.panzhihua.common.model.dtos.community.building.BuildingDto;
			import com.panzhihua.common.model.dtos.community.convenient.*;
			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.large.AreaStreetDetail;
			import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp;
			import com.panzhihua.common.model.dtos.community.reserve.*;
			import com.panzhihua.common.model.dtos.community.sanshuo.*;
			import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
			import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
			import com.panzhihua.common.model.dtos.community.cluster.admin.*;
			import com.panzhihua.common.model.dtos.partybuilding.QryReportResp;
			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;
			@@ -20,17 +27,24 @@
			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.dtos.shop.*;
			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.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.SocialProjectVO;
			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.shop.AddShopFlowerGoodsVO;
			import com.panzhihua.common.utlis.StringUtils;
			import io.swagger.annotations.ApiOperation;
			import com.panzhihua.common.model.vos.community.*;
			import org.springframework.beans.BeanUtils;
			import io.swagger.annotations.ApiParam;
			import org.springframework.cloud.openfeign.FeignClient;
			import org.springframework.scheduling.annotation.Async;
			import org.springframework.web.bind.annotation.DeleteMapping;
			@@ -41,90 +55,24 @@
			import org.springframework.web.bind.annotation.RequestBody;
			import org.springframework.web.bind.annotation.RequestParam;

			import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
			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.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.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.bigscreen.BigScreenEventDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
			@@ -141,48 +89,70 @@
			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.rentingHouses.*;
			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;
			@@ -195,13 +165,18 @@
			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;
			@@ -237,102 +212,21 @@
			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;
			import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
			import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
			import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
			import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
			import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
			import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
			import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
			import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
			import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
			import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
			import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
			import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
			import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
			import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
			import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
			import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
			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;
			@@ -340,6 +234,13 @@
			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;
			@@ -353,6 +254,10 @@
			import com.panzhihua.common.model.vos.shop.ShopStoreVO;
			import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
			import com.panzhihua.common.model.vos.user.UserPhoneVO;
			import org.springframework.web.multipart.MultipartFile;

			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletResponse;

			/**
			* @program: springcloud_k8s_panzhihuazhihuishequ
			@@ -360,7 +265,7 @@
			* @author: huang.hongfa weixin hhf9596 qq 959656820
			* @create: 2020-12-07 15:59
			**/
			@FeignClient(name = "community")
			@FeignClient(name = "huacheng-community")
			public interface CommunityService {
			/**
			* 新增社区活动
			@@ -614,6 +519,16 @@
			R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

			/**
			* 分页查询随手拍浪潮专用
			*
			* @param comActEasyPhotoVO
			* 查询参数
			* @return 心愿列表
			*/
			@GetMapping("pageEasyPhotoAdminLC")
			R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize);

			/**
			* 随手拍详情
			*
			* @param id
			@@ -624,6 +539,19 @@
			*/
			@PostMapping("detaileasyphoto")
			R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

			/**
			* 随手拍详情
			*
			* @param id
			* 随手拍主键
			* @param userId
			* 登录用户id
			* @return 详情内容
			*/
			@PostMapping("detaileasyphotodesensitize")
			R detailEasyPhotoDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);


			/**
			* 随手拍删除
			@@ -656,6 +584,15 @@
			*/
			@PostMapping("pagemicrowish/applets")
			R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO);
			/**
			* 小程序分页查询微心愿
			*
			* @param comActMicroWishVO
			* 查询参数
			* @return 分页集合
			*/
			@PostMapping("pagemicrowish/appletsDesensitize")
			R pageMicroWishAppletsDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO);

			/**
			* 心愿详情
			@@ -668,6 +605,17 @@
			*/
			@PostMapping("detailmicrowish")
			R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
			/**
			* 心愿详情
			*
			* @param id
			* 查询主键
			* @param userId
			* 登录用户id
			* @return 心愿内容
			*/
			@PostMapping("detailmicrowishdesensitize")
			R detailMicroWishDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

			/**
			* 审核、分配、反馈心愿
			@@ -934,7 +882,7 @@
			* @return 类型列表
			*/
			@PostMapping("listbuildtype")
			R listBuildType();
			R listBuildType(@RequestParam("communityId")Long communityId);

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

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

			/**
			* 首页广告banner
			@@ -1200,7 +1149,7 @@
			* @return
			*/
			@PostMapping("listadvertisement")
			R listAdvertisement();
			R listAdvertisement(@RequestParam("type") Integer type);

			/**
			* 新增广告
			@@ -1349,6 +1298,17 @@
			R pageEasyPhotoApplets(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

			/**
			* 小程序分页查询随手拍
			*
			* @param comActEasyPhotoVO
			* 查询参数
			* @return 返回结果
			*/
			@PostMapping("pageeasyphotoappletsdesensitize")
			R pageEasyPhotoAppletsDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);


			/**
			* 随手拍评论分页查询
			*
			* @param pageComActEasyPhotoCommentDTO
			@@ -1357,6 +1317,16 @@
			*/
			@PostMapping("pagecomacteasyphotocomment")
			R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);

			/**
			* 随手拍评论分页查询 - 脱敏
			*
			* @param pageComActEasyPhotoCommentDTO
			* 查询参数
			* @return 查询结果
			*/
			@PostMapping("pagecomacteasyphotocommentdesensitize")
			R pageComActEasyPhotoCommentDesensitize(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);

			/**
			* 评论点赞/取消点赞
			@@ -1523,6 +1493,15 @@
			*/
			@PostMapping("pagediscussapplets")
			R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
			/**
			* 议事投票-分页查询小程序 -脱敏
			*
			* @param pageComActDiscussDTO
			* 查询参数
			* @return ComActDiscussVO 分页
			*/
			@PostMapping("pagediscussappletsdesensitize")
			R pageDiscussAppletsDesensitize(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

			/**
			* 议事投票-点赞、取消点赞
			@@ -1544,6 +1523,26 @@
			@PostMapping("pagediscusscommentapplets")
			R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);


			/**
			* 议事投票-评论-删除小程序
			*
			* 分页参数
			* @return ComActDiscussCommentVO
			*/
			@GetMapping("deleteCommentApplets")
			R deleteCommentApplets(@RequestParam("id") String id);

			/**
			* 议事投票-评论-分页查询小程序脱敏
			*
			* @param pageComActDiscussCommentDTO
			* 分页参数
			* @return ComActDiscussCommentVO
			*/
			@PostMapping("pagediscusscommentappletsdesensitize")
			R pageDiscussCommentAppletsDesensitize(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

			/**
			* 议事投票-详情小程序
			*
			@@ -1555,16 +1554,27 @@
			*/
			@PostMapping("detaildiscussapplets")
			R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
			/**
			* 议事投票-详情小程序
			*
			* @param id
			* 主键
			* @param userId
			* 登录用户主键
			* @return ComActDiscussVO
			*/
			@PostMapping("detaildiscussappletsdesensitize")
			R detailDiscussAppletsDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

			/**
			* 议事投票-投票
			*
			* @param comActDiscussOptionUserDTO
			* @param discussVoteOptionDTO
			* 投票信息
			* @return 投票结果
			*/
			@PostMapping("adddiscussoptionuser")
			R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
			R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO);

			/**
			* 议事投票-评论-点赞、取消点赞
			@@ -2199,10 +2209,24 @@
			*
			* @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);

			/**
			* 查询省下所有区域 tree结构
			*
			* @param provinceAdcode
			* 省份code
			* @param areaCode
			* @return 查询结果
			*/
			@GetMapping("/common/data/area/basiclevel")
			R getCityTreeByCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
			@RequestParam(value = "areaCode", required = false) String areaCode,
			@RequestParam(value = "appId", required = false) String appId);

			/**
			* 分页查询街道
			@@ -2222,7 +2246,7 @@
			* @return 新增结果
			*/
			@PostMapping("/addstreet")
			R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVOO);
			R addStreet(@RequestBody ComStreetVO comStreetVOO);

			/**
			* 删除街道
			@@ -2524,6 +2548,17 @@
			R pagePopulation(ComMngPopulationDTO comMngPopulationVO);

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


			/**
			* 根据身份证查询实有人口信息
			*/
			@GetMapping("/common/data/population/selectByIdCard")
			@@ -2685,7 +2720,7 @@
			* @return 问卷调查详情
			*/
			@GetMapping("/questnaire/view/detail")
			R viewDetail(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
			R viewDetail( @RequestParam("questId") Long questId,@RequestParam("userId") Long userId);

			/**
			* 小程序-新增问卷调查浏览数量
			@@ -2871,6 +2906,73 @@
			*/
			@GetMapping("/shop/changeShopGoodsStatus")
			R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

			/**
			* 商品列表-分页查询
			*
			* @param pageComShopGoodsDTO
			* 添加数据
			*/
			@PostMapping("/shopFlower/pageGoods")
			R pageFlowerGoodsList(@RequestBody PageComShopFlowerGoodsDTO pageComShopGoodsDTO);

			/**
			* 商品列表-分页查询
			*
			* @param comShopFlowerGoodsDTO
			* 添加数据
			*/
			@PostMapping("/shopFlower/pageShopFlowerGoodsByApp")
			R pageShopFlowerGoodsByApp(@RequestBody ComShopFlowerGoodsDTO comShopFlowerGoodsDTO);


			/**
			* 新增商品
			*
			* @param addShopGoodsVO
			* @return
			*/
			@PostMapping("/shopFlower/saveShopGoods")
			R saveFlowerShopGoods(@RequestBody AddShopFlowerGoodsVO addShopGoodsVO);

			/**
			* 编辑商品
			*
			* @param id
			* @param addShopGoodsVO
			* @return
			*/
			@PostMapping("/shopFlower/editShopGoods/{id}")
			R editFlowerShopGoods(@PathVariable("id") Long id, @RequestBody AddShopFlowerGoodsVO addShopGoodsVO);

			/**
			* 删除商品
			*
			* @param goodsId
			* @return
			*/
			@DeleteMapping("/shopFlower/deleteShopGoods")
			R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId);

			/**
			* 修改商品状态
			*
			* @param id
			* @return
			*/
			@GetMapping("/shopFlower/changeShopGoodsStatus")
			R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

			/**
			* 商品详情
			*
			* @param goodsId
			* @return
			*/
			@GetMapping("/shopFlower/shopGoodsDetail")
			R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId);



			/**
			* 结果
			@@ -3291,7 +3393,7 @@
			* @return 详情
			*/
			@GetMapping("/detailworkguide")
			R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId);
			R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam("communityId") String communityId);

			/**
			* 办事指南_分页
			@@ -3350,7 +3452,7 @@
			* @date 2021/8/31 15:03
			*/
			@GetMapping("/workGuide/classify/getList")
			R getWorkGuideClassifyList();
			R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode);

			/**
			* 分页查询邻里圈
			@@ -3392,6 +3494,15 @@
			@PostMapping("/neighbor/pageNeighborByAdmin")
			R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);

			/**
			* 统计大屏查询清单列表
			*
			* @param comActNeighborCircleAdminDTO
			* 请求参数
			* @return 邻里圈列表
			*/
			@PostMapping("/neighbor/pageNeighborByBigScreen")
			R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
			/**
			* 后台修改邻里圈
			*
			@@ -4942,12 +5053,21 @@
			/**
			* 小程序查询邻里圈话题列表
			*
			* @param communityId
			* 社区id
			* @return 邻里圈话题列表
			*/
			@GetMapping("/neighbor/getNeighborTopicByApp")
			R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);
			R getNeighborTopicByApp(@RequestParam("name") String name);

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

			/**
			* 综治后台-查询社区列表
			@@ -4963,7 +5083,7 @@
			* @return 社区列表
			*/
			@GetMapping("/eventgrid/community/westList")
			R getWestCommunityLists();
			R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode);

			/**
			* 综治app-小区列表
			@@ -5256,14 +5376,23 @@
			R getIntegralReceiveApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

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

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

			/**
			* 小程序-查询社区积分账户排行榜
			@@ -5418,7 +5547,7 @@
			* @return 社区列表
			*/
			@GetMapping("/switch/community/all/list")
			R communitySwitchList();
			R communitySwitchList(@RequestParam("appId") String appId);

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

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

			/**
			* 社区后台-切换随手拍公示状态
			@@ -5556,6 +5685,9 @@

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

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

			/**
			* 社区后台-根据社区id统计预约类数据
			@@ -5738,6 +5870,15 @@
			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
			* @return 约登记题目列表
			@@ -5752,6 +5893,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);

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


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


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

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

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

			/**
			* 获取系统配置value
			@@ -6197,7 +6378,7 @@
			* @return 单条数据
			*/
			@GetMapping("/comActFourMember/{id}")
			R comActFourMemberSelectOne(@PathVariable("id") Integer id);
			R comActFourMemberSelectOne(@PathVariable("id") Long id);

			/**
			* 新增数据
			@@ -6252,7 +6433,7 @@
			* @return 菜单列表
			*/
			@PostMapping("/common/data/population/second/listBack")
			public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);
			R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);

			/**
			* 微心愿处理人列表
			@@ -6345,6 +6526,14 @@
			R getMerchant(@RequestParam("merchantId") Long merchantId);

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

			/**
			* 禁用/启用便民服务商家
			* @param disableOrEnableConvenientMerchantDTO
			* @return
			@@ -6365,7 +6554,7 @@
			* @return
			*/
			@GetMapping("/convenient/service-category/all")
			R getAllServiceCategories();
			R getAllServiceCategories(@RequestParam("areaCode") String areaCode);

			/**
			* 获取用户便民服务商家详情
			@@ -6374,6 +6563,14 @@
			*/
			@GetMapping("/convenient/getUserMerchantInfoByAccount")
			R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);

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

			/**
			* 获取商便民服务商家信息
			@@ -6486,7 +6683,7 @@
			* @return
			*/
			@GetMapping("/convenient/service-category/suitable")
			R getSuitableServiceCategories(@RequestParam("communityId") Long communityId);
			R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode);

			/**
			* 获取该社区下的热门商家
			@@ -6869,6 +7066,14 @@
			*/
			@PostMapping("/building/house/population/delete/admin")
			R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);

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

			/**
			* 分页查询所有数据
			@@ -7513,7 +7718,7 @@

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

			/**
			* 西区大屏治理数据
			@@ -7552,11 +7757,11 @@

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

			/**
			* 社区服务大屏数据分析接口
			@@ -7704,6 +7909,735 @@
			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 主键
			@@ -7711,6 +8645,16 @@
			*/
			@GetMapping("/comActSocialOrg/{id}")
			R comActSocialOrgSelectOne(@PathVariable("id") Long id);


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

			/**
			* 分页查询所有数据
			@@ -7740,6 +8684,15 @@
			public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember);

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

			/**
			* 修改数据
			*
			* @param comActSocialMember 实体对象
			@@ -7762,7 +8715,7 @@
			* @param comActSocialWorkerAddDTO
			* @return 新增结果
			*/
			@PostMapping("/comactsocialworker/add")
			@PostMapping("/comActSocialWorker/add")
			R addComactsocialworker(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);

			/**
			@@ -7770,7 +8723,7 @@
			* @param comActSocialWorkerEditDTO
			* @return 维护结果
			*/
			@PostMapping("/comactsocialworker/edit")
			@PostMapping("/comActSocialWorker/edit")
			R editComactsocialworker(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);

			/**
			@@ -7778,7 +8731,7 @@
			* @param pageComActSocialWorkerDTO
			* @return 维护结果
			*/
			@PostMapping("/comactsocialworker/page")
			@PostMapping("/comActSocialWorker/page")
			R queryComactsocialworker(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO);//返回 R<IPage<ComActSocialWorkerVO>>

			/**
			@@ -7786,7 +8739,7 @@
			* @param comActSocialWorkerDeleteDTO
			* @return 平台用户信息
			*/
			@PostMapping("/comactsocialworker/delete")
			@PostMapping("/comActSocialWorker/delete")
			R deleteComactsocialworker(@RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO);

			/**
			@@ -7794,16 +8747,60 @@
			* @param id 社工 id
			* @return 查找结果
			*/
			@PostMapping("/comactsocialworker/{id}")
			R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
			@PostMapping("/comActSocialWorker/{id}")
			R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id);

			/**
			* 批量导入社工
			*
			* @param list 社工集合
			*/
			@PostMapping("/comactsocialworker/input")
			@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);

			/**
			* 分页查询所有数据
			*
			@@ -7855,10 +8852,11 @@
			/**
			* 小程序详情接口
			* @param id
			* @param userId
			* @return
			*/
			@GetMapping("/comActSocialProject/getApplet")
			R getAppletComActSocialProject(@RequestParam("id") Long id);
			R getAppletComActSocialProject(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);

			/**
			* 分页查询所有数据
			@@ -7920,7 +8918,7 @@
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActSocialProjectPublicity/{id}")
			@GetMapping("/comActSocialProjectPublicity/getByApplet/{id}")
			public R selectOneComActSocialProjectPublicity(@PathVariable("id") Long id);


			@@ -8009,6 +9007,2945 @@
			* @param comActColumnVO
			* @return
			*/
			@PostMapping("/queryLevel")
			@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);

			@GetMapping("/comActAcidRecord/checkCommit")
			R checkCommit(@RequestParam(value = "userId",required = false)Long userId);


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

			/**
			* 单位活动统计
			*/
			@GetMapping("/neighbor/activityAnalysis")
			R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,
			@RequestParam(value = "type",required = false) Integer type,
			@RequestParam(value = "range",required = false)Integer range,
			@RequestParam(value = "communityId",required = false) Long communityId,
			@RequestParam(value = "page",required = false) Integer page,
			@RequestParam(value = "size",required = false) Integer size,
			@RequestParam(value = "belongTo",required = false) String belongTo,
			@RequestParam(value = "unitId",required = false) Long unitId,
			@RequestParam(value = "loginAccount",required = false) String loginAccount,
			@RequestParam(value = "searchContent",required = false) String searchContent);

			@GetMapping("/neighbor/export")
			public List<ExcelDO> export(@RequestParam(value = "year",required = false) Integer year,
			@RequestParam(value = "belongTo",required = false) String belongTo,
			@RequestParam(value = "communityId",required = false) Long communityId);

			@GetMapping("/neighbor/partyExcel")
			public List<PartyExcelDO> partyExcel(@RequestParam(value = "year",required = false) Integer year,
			@RequestParam(value = "belongTo",required = false) String belongTo,
			@RequestParam(value = "communityId",required = false) Long communityId,
			@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);

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

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

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

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

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

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

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

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

			/**
			* 小程序获取可用的行业中心列表
			* @return
			* */
			@GetMapping("/sanshuo/industryCenter/appletsList")
			R industryCenterAppList();

			/**
			* 后台获取行业中心列表
			* */
			@GetMapping("/sanshuo/industryCenter/list")
			R backIndustrytList(@RequestParam(value = "keyWord",required = false)String keyWord,
			@RequestParam(value = "page",required = false)Integer page,
			@RequestParam(value = "size",required = false)Integer size);

			/**
			* 添加业务中心
			* */
			@PostMapping("/sanshuo/industryCenter")
			R addIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);

			/**
			* 修改业务中心
			* */
			@PutMapping("/sanshuo/industryCenter")
			R updateIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);

			/**
			* 删除业务中心
			* */
			@DeleteMapping("/sanshuo/industryCenter/remove")
			R removeIndustry(@RequestParam("id") Long id);

			/**
			* 重置业务中心密码
			* */
			@PostMapping("/sanshuo/industryCenter/resetPass")
			R resetIndustryPassword(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);

			/**
			* 业务中心详情
			* */
			@GetMapping("/sanshuo/industryCenter/detail")
			R industryCenterDetail(@RequestParam("id") Long id);

			/**
			* 后台获取专家列表
			* */
			@GetMapping("/sanshuo/expert/backstageList")
			R backExpertList(@RequestParam(value = "keyWord",required = false)@ApiParam("搜索关键字") String keyWord,
			@RequestParam(value = "page",required = false)Integer page,
			@RequestParam(value = "size",required = false)Integer size,
			@RequestParam(value = "level",required = false)Integer level);

			/**
			* 添加专家
			* */
			@PostMapping("/sanshuo/expert")
			R addExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);

			/**
			* 修改专家
			* */
			@PutMapping("/sanshuo/expert")
			R updateExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);

			/**
			* 删除专家
			* */
			@DeleteMapping("/sanshuo/expert/remove")
			R removeExpert(@RequestParam("id")Long id);

			/**
			* 重置专家登陆密码
			* */
			@PostMapping("/sanshuo/expert/resetPassword")
			R resetExpertPassword(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);

			/**
			* 小程序获取可选择专家列表
			* */
			@GetMapping("/sanshuo/expert/appletsList")
			R expertAppList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id);

			/**
			* 获取专家详情
			* */
			@GetMapping("/sanshuo/expert/detail")
			R expertDetail(@RequestParam("id") Long id);

			/**
			* 后台事件列表
			* */
			@GetMapping("/sanshuo/event/list")
			R backEventList(@RequestParam(value = "keyWord",required = false)String keyWord,
			@RequestParam(value = "page",required = false)Integer page,
			@RequestParam(value = "size",required = false)Integer size);

			/**
			* 事件详情
			* */
			@GetMapping("/sanshuo/event/detail")
			R eventDetail(@RequestParam(value = "id",required = false)Long id);

			/**
			* 小程序获取事件列表
			* */
			@GetMapping("/sanshuo/event/appletsList")
			R eventAppList();

			/**
			* 新增事件类型
			* */
			@PostMapping("/sanshuo/event")
			R addEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);

			/**
			* 新增事件类型
			* */
			@PutMapping("/sanshuo/event")
			R updateEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);

			/**
			* 删除事件类型
			* */
			@DeleteMapping("/sanshuo/event/remove")
			R removeEvent(@RequestParam(value = "id",required = false)Long id);

			/**
			* 专家风采
			* */
			@GetMapping("/sanshuo/expert/expertShow")
			R expertShow();


			@GetMapping("/sanshuo/expert/expertRange")
			R expertRange();

			/**
			* 大屏事件统计
			* */
			@PostMapping("/sanshuo/comEvent/indexData")
			R sanshuoIndexDate(IndexDateDTO indexDateDTO);

			/**
			* 事件占比统计饼图
			* */
			@GetMapping("sanshuo/comEvent/indexData/event")
			R eventIndexData(@RequestParam("type") Integer type);

			/**
			* 专家风采列表
			* */
			@GetMapping("/sanshuo/expert/expertShowList")
			R expertShowList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id);

			/**
			* 修改街道信息
			* */
			@PostMapping("/updateStreet")
			R updateStreet(@RequestBody ComStreetVO comStreetVO);

			/**
			* 删除街道
			* */
			@GetMapping("/removeStreet")
			R removeStreet(@RequestParam(value = "id",required = false)Long id);

			/***
			* 删除社区
			* */
			@GetMapping("/removeCommunity")
			R removeCommunity(@RequestParam(value = "id",required = false)Long id);

			@PostMapping("/repassCommunity")
			R repassCommunity(@RequestBody ComActVO comActVO);

			@PostMapping("/repassStreet")
			R repassStreet(@RequestBody ComStreetVO comActVO);

			/**
			* 是否有绑定手机号码的专家账号
			* */
			@GetMapping("/sanshuo/expert/checkExpert")
			R isExpert(@RequestParam(value = "number",required = false) String number);

			@GetMapping("/sanshuo/comEvent/streetList")
			R streetList();

			@PostMapping("/sanshuo/expert/importExpert")
			R importExpert(@RequestBody MultipartFile file);

			@GetMapping("/sanshuo/comEvent/communityList")
			R westList();

			@GetMapping("/sanshuo/expert/backstageList2")
			R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "page",required = false)Integer page,
			@RequestParam(value = "size",required = false)Integer size,@RequestParam(value = "keyWord",required = false)String keyWord);

			/**
			* 查询社区id集合
			* @param id
			* @return
			*/
			@GetMapping("selectCommunityIds")
			R selectCommunityIds(@RequestParam("id") Long id);

			/**
			* 查询社区id集合
			* @param id
			* @return
			*/
			@GetMapping("selectAutomessageSysUserById")
			R selectAutomessageSysUserById(@RequestParam("id") Long id);

			/**
			* 分页查询议事委员会列表
			* */
			@GetMapping("/proceedings/list")
			R proceedingsList(@RequestParam(value = "page",required = false) Integer page,
			@RequestParam(value = "size",required = false) Integer size,
			@RequestParam(value = "keyWord",required = false) String keyWord);
			/**
			* 添加或修改议事委员会
			* */
			@PostMapping("/proceedings")
			R addOrUpdateProceedings(@RequestBody ComActProceedingsDTO comActProceedingsDTO);

			/**
			* 自提点分页查询
			* @param pageConvenientElevatingPointDTO
			* @return
			*/
			@PostMapping("/convenient/point/page")
			R pagePoint(PageConvenientElevatingPointDTO pageConvenientElevatingPointDTO);

			/**
			* 新增自提点
			* @param convenientElevatingPointDTO
			* @return
			*/
			@PostMapping("/convenient/point/add")
			R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);

			/**
			* 编辑自提点
			* @param convenientElevatingPointDTO
			* @return
			*/
			@PutMapping("/convenient/point/put")
			R putPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);

			/**
			* 删除便民服务自提点
			* @param pointId
			* @param operator
			* @return
			*/
			@DeleteMapping("/convenient/point/delete")
			R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);

			/**
			* 便民服务详情自提点
			* @param pointId
			* @return
			*/
			@GetMapping("/convenient/point/detail")
			R detailPoint(@RequestParam("pointId") Long pointId);

			/**
			* 新增商品分类
			* @param convenientGoodsCategoryDTO
			* @return
			*/
			@PostMapping("/convenient/goodsCategory/add")
			R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

			/**
			* 编辑
			* @param convenientGoodsCategoryDTO
			* @return
			*/
			@PutMapping("/convenient/goodsCategory/put")
			R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

			/**
			* 删除商品分类
			* @param categoryId
			* @return
			*/
			@DeleteMapping("/convenient/goodsCategory/delete")
			R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);

			/**
			* 获取商品分类详情
			* @param categoryId
			* @return
			*/
			@GetMapping("/convenient/goodsCategory/get")
			R getGoodsCategory(@RequestParam("categoryId") Long categoryId);

			/**
			* 分页查询商品分类
			* @param pageConvenientGoodsCategoryDTO
			* @return
			*/
			@PostMapping("/convenient/goodsCategory/page")
			R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);

			@GetMapping("/dataCount")
			R dataCount();

			@DeleteMapping("/proceedings/remove")
			R removeProceedings(@RequestParam("id") Long id);

			/**
			* 获取物业公司通知公告列表
			* */
			@GetMapping("comProperty/noticeList")
			R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);

			/**
			* 获取所有商品分类
			* @return
			*/
			@GetMapping("/convenient/goodsCategory/getAllGoodsCategories")
			R getAllGoodsCategories();

			/**
			* 分页查询用户收货地址列表
			*
			* @param comShopAddressDTO
			* 请求参数
			* @return 用户收货地址列表
			*/
			@PostMapping("/shopFlower/shopUserAddressList")
			R shopFlowerUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);

			/**
			* 用户添加收货地址
			*
			* @param comShopAddressDTO
			* 请求参数
			* @return 添加结果
			*/
			@PostMapping("/shopFlower/shopAddUserAddress")
			R shopFlowerAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

			/**
			* 用户修改收货地址
			*
			* @param comShopAddressDTO
			* 请求参数
			* @return 修改结果
			*/
			@PostMapping("/shopFlower/shopEditUserAddress")
			R shopFlowerEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

			/**
			* 用户删除收货地址
			*
			* @param addressId
			* 收货地址id
			* @return 删除结果
			*/
			@DeleteMapping("/shopFlower/shopDelUserAddress")
			R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);

			/**
			* 订单预览
			*
			* @param orderPreviewDTO 请求参数
			* @return 订单预览数据
			*/
			@PostMapping("/shopFlower/orderPreview")
			R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);

			/**
			* 创建订单
			*
			* @param orderCreateDTO 创建订单请求参数
			* @return 创建结果
			*/
			@PostMapping("/shopFlower/orderCreate")
			R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO);

			/**
			* 分页查询用户订单列表
			*
			* @param comOrderListDTO 请求参数
			* @return 查询结果
			*/
			@PostMapping("/shopFlower/pageOrderList")
			R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO);

			/**
			* 根据订单id查询订单详情
			*
			* @param orderId 订单id
			* @return 订单详情
			*/
			@GetMapping("/shopFlower/orderDetail")
			R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone);

			/**
			* 根据订单id取消订单
			*
			* @param comShopOrderQueryDTO 请求参数
			* @return 取消结果
			*/
			@PostMapping("/shopFlower/orderCancel")
			R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

			/**
			* 根据订单id删除订单
			*
			* @param orderId 订单id
			* @return 删除结果
			*/
			@DeleteMapping("/shopFlower/orderDelete")
			R orderDeleteFlower(@RequestParam("orderId") Long orderId);

			/**
			* 根据订单id确认收货
			*
			* @param comShopOrderQueryDTO 请求参数
			* @return 确认结果
			*/
			@PostMapping("/shopFlower/orderConfirm")
			R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

			/**
			* 分页查询商家订单
			*
			* @param pageComShopOrderSearchDTO 分页数据
			* @return 分页订单
			*/
			@PostMapping("/shopFlower/order/page")
			R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
			/**
			* 订单发货
			*
			* @param orderShipDTO 发货信息
			* @return 发货结果
			*/
			@PostMapping("/shopFlower/shipOrder")
			R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO);

			/**
			* 订单配送
			*
			* @param deliverDTO 订单ID
			* @return 配送结果
			*/
			@PostMapping("/shopFlower/deliverOrder")
			R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);

			/**
			* 订单配送
			*
			* @param deliverDTO 订单ID
			* @return 配送完成
			*/
			@PostMapping("/shopFlower/finishDeliverOrder")
			R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);

			/**
			* 获取当前商铺周围的自提点信息以及距离手机距离
			*
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/point/findPointByMerchantId")
			R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng);

			/**
			* 保存评价
			* @param comShopFlowerEvaluateDTO
			* @return
			*/
			@PostMapping("/shopFlower/saveEvaluate")
			R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO);

			/**
			* 分页查询评价
			* @param pageComShopFlowerEvaluateDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageEvaluate")
			R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);

			/**
			* 评价详情
			* @param id
			* @return
			*/
			@GetMapping("/shopFlower/detailEvaluate")
			R detailEvaluate(@RequestParam("id") Long id);

			/**
			* 删除评价
			* @param id
			* @return
			*/
			@DeleteMapping("/shopFlower/deleteEvaluate")
			R deleteEvaluate(@RequestParam("id") Long id);

			/**
			* 取货码
			* @param id
			* @return
			*/
			@ApiOperation(value = "取货码")
			@GetMapping("/shopFlower/getQRCode")
			R getQRCode(@RequestParam("id") Long id);

			/**
			* 保存配送单
			* @param comShopFlowerOrderDeliveryDTO
			*/
			@PostMapping("/shopFlower/saveDelivery")
			R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

			/**
			* 更新配送单
			* @param comShopFlowerOrderDeliveryDTO
			*/
			@PostMapping("/shopFlower/updateDelivery")
			R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

			/**
			* 已配送、已送达分页查询
			* @param pageComFlowerOrderDeliveryDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageDelivery")
			R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

			/**
			* 未配送分页查询
			* @param pageComFlowerOrderDeliveryDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageNoDelivery")
			R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

			/**
			* 未配送-开始配送-订单列表
			* @param pageComFlowerOrderListDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageNoDeliveryOrderList")
			R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

			/**
			* 根据商家id查询商家的订单
			* @param pageComFlowerOrderListDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageOrderByStoreId")
			R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

			/**
			* 微信支付订单回调
			*
			* @param wxPayNotifyOrderDTO
			* 订单支付回调参数
			*/
			@PostMapping("/shopFlower/wxOrderPayNotify")
			void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);

			/**
			* 点击去支付订单
			*
			* @param orderPayDTO
			* 请求参数
			* @return 支付对象
			*/
			@PostMapping("/shopFlower/wxPay")
			R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO);

			/**
			* 获取社区动态置顶banner
			* @param communityId 社区id
			* */
			@PostMapping("/easyphoto/getUserRewardsNew")
			R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

			/**
			* 统计查询订单数量
			* @param deliveryType
			* @param userId
			* @return
			*/
			@GetMapping("/shopFlower/selectCountByDeliveryType")
			R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("userId") Long userId);

			/**
			* 查询我的店铺各类统计数据
			* @param userId
			* @return
			*/
			@GetMapping("/shopFlower/selectCountByUserId")
			R selectCountByUserId(@RequestParam("userId") Long userId);


			/**
			* 创建退款订单
			* @param comShopFlowerRefundOrderDTO
			* @return
			*/
			@PostMapping("/shopFlower/createRefundOrder")
			R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);

			/**
			* 分页查询
			* @param pageComOrderRefundDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageRefundOrder")
			R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO);

			/**
			* 修改退款订单
			* @param comShopFlowerRefundOrderDTO
			* @return
			*/
			@PostMapping("/shopFlower/updateRefundOrder")
			R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);


			/**
			* 商家后台-退款申请统计
			* @param storeId
			* @return
			*/
			@GetMapping("/shopFlower/selectCountGroupStatus")
			R selectCountGroupStatus(@RequestParam("storeId") Long storeId);

			/**
			* 新增商品浏览量
			* @param goodsId
			* @return
			*/
			@GetMapping("/shopFlower/incrGoodsView")
			R incrGoodsView(@RequestParam("goodsId") Long goodsId);

			/**
			* 出入账分页
			* @param pageComShopFlowerOrderPayDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageOrderPay")
			R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO);

			/**
			* 获取商家的营业额和可结算金额
			* @param storeId
			* @return
			*/
			@GetMapping("/shopFlower/getQuota")
			R getQuota(@RequestParam("storeId") Long storeId);

			/**
			* 取消退款
			* @param id
			* @return
			*/
			@GetMapping("/shopFlower/refundOrderCancel")
			R refundOrderCancel(@RequestParam("id") Long id);

			/**
			* 退款订单详情
			* @param id
			* @return
			*/
			@GetMapping("/shopFlower/refundOrderDetail")
			R refundOrderDetail(@RequestParam("id") Long id);

			/**
			* 清点商品确认送达详情
			* @param pageComFlowerOrderListDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageOrderByDeliveryNo")
			R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

			/**
			* 商家后台经营数据统计-上
			* @param storeId
			* @return
			*/
			@GetMapping("/shopFlower/selectSumOrderAndAmountByStoreId")
			R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId);

			/**
			* 统计时间区域的订单量 15天 30天一年
			* @param storeId
			* @param type
			* @return
			*/
			@GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type,@RequestParam("tab") Integer tab);

			/**
			* 统计上架的上下架商品数量
			* @param userId
			* @return
			*/
			@GetMapping("/shopFlower/countSaleByUserId")
			R countSaleByUserId(@RequestParam("userId") Long userId);

			/**
			* 查询统计基础数据
			* @return
			*/
			@GetMapping("/selectBasicData")
			R selectBasicData();

			/**
			* 统计在职干部特长
			* @return
			*/
			@GetMapping("/statisticsPbMemberType")
			R statisticsPbMemberType();


			/**
			* 统计单位
			* @return
			*/
			@GetMapping("/selectUnitByNatureName")
			R selectUnitByNatureName();

			/**
			* 大屏-社区活动分页
			* @return
			*/
			@PostMapping("pageActivityBigScreen")
			R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 疫情防控健康码统计
			* @return
			*/
			@GetMapping("/comActAcidRecord/selectColorMarkGroup")
			R selectColorMarkGroup();


			@GetMapping("easyphoto/selectStatisticsPhoto")
			R selectStatisticsPhoto();

			/**
			* 获取商家周围 n(km)的自提点数量
			*
			* @param distance
			* @return
			*/
			@GetMapping("/convenient/point/findPointNumByDistance")
			R findPointNumByDistance(@RequestParam("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng);


			/**
			* 普达大屏-自治动态
			* */
			@GetMapping("/pudaScreen/autonomyDynamic")
			R autonomyDynamic();

			/**
			* 普达大屏-红色物业
			* */
			@GetMapping("/pudaScreen/propertyDynamic")
			R propertyDynamic();

			/**
			* 普达大屏-党建数据
			**/
			@GetMapping("/pudaScreen/partyData")
			R partyData();

			/**
			*
			* 普达大屏-居民信息
			* */
			@GetMapping("/pudaScreen/peopleInfo")
			R peopleInfo();


			/**
			* 普达大屏-小区院落
			* */
			@GetMapping("/pudaScreen/countryard")
			R countryard();

			/**
			* 普达大屏-基础数据
			* */
			@GetMapping("/pudaScreen/basicData")
			R basicData();

			/**
			* 普达大屏-特殊人群
			* */
			@GetMapping("/pudaScreen/specialPeople")
			R specialPeople();



			/**
			* 通过洗车订单查询银联订单
			*
			* @return
			*/
			@GetMapping("/unionpay/detail")
			R queryById(@RequestParam("Id") String id);


			/**
			* 通过银联订单查询洗车订单
			*
			* @return
			*/
			@GetMapping("/unionpay/unionpayDetail")
			R carWashById(@RequestParam("Id") String id);

			/**
			* 新增洗车订单和银联订单关系
			* @param carWashId
			* @param unionpayOrderId
			* @param money
			* @return
			*/
			@PostMapping("/unionpay/add")
			int add(@RequestParam("carWashId") String carWashId,
			@RequestParam("unionpayOrderId") String unionpayOrderId,
			@RequestParam("money") String money);






			/*********************************************************************************************************
			*
			*
			* 最美志愿者
			*
			*
			* *********************************************************************************************************/
			@GetMapping("/MostBeautifu/queryById")
			public R queryById2(@RequestParam("id") String Id);


			/**
			* 分页查询
			* @param name
			* @param unmountType
			* @return
			*/
			@GetMapping("/MostBeautifu/getqueryList")
			public R queryList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize")int pageSize,
			@RequestParam(value = "name", required = false) String name,
			@RequestParam(value = "unmountType", required = false) String unmountType);



			/**
			* 新增
			* @param mostBeautifulVolunteerVO
			* @return
			*/
			@PostMapping("/MostBeautifu/addMostBeautiful")
			public R insertMostBeautifulVolunteer(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);


			/**
			* 更新
			* @param mostBeautifulVolunteerVO
			* @return
			*/
			@PostMapping("/MostBeautifu/upMostBeautiful")
			public R updateById(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);


			/**
			* 删除
			* @param Id
			* @return
			*/
			@DeleteMapping("/MostBeautifu/delectVuId")
			public R deleteById(@RequestParam("id") String Id);


			/********************************************************************************************************************
			*
			*
			* 志愿者活动
			*
			*
			*******************************************************************************************************************/
			/**
			* 获取单个详情
			* @param id
			* @return
			*/
			@GetMapping("Volunteer/queryById")
			R volunteerQueryById(@RequestParam("id") String id);

			/**
			* 分页查询
			* @param
			* @return
			*/
			@GetMapping("Volunteer/queryList")
			R volunteerQueryList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "name", required = false) String name,
			@RequestParam(value = "acState", required = false) String acState,
			@RequestParam(value = "acType", required = false) String acType,
			@RequestParam(value = "actityBeginTime", required = false) Date actityBeginTime,
			@RequestParam(value = "actityEndTime", required = false) Date actityEndTime);

			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("Volunteer/insertVolunteer")
			R insertVolunteer(@RequestBody VolunteerActivityVO volunteerActivityVO);


			@PostMapping("Volunteer/updateById")
			R volunteerUpdateById(@RequestBody VolunteerActivityVO volunteerActivityVO);


			@DeleteMapping("Volunteer/deleteById")
			R volunteerDeleteById(@RequestParam("id") String id);



			/**
			* 定时刷新活动状态
			* @return
			*/
			@GetMapping("/Volunteer/timedTaskVolunteerActivitiesJobHandler")
			public R timedTaskVolunteerActivitiesJobHandler();


			/*******************************************************************************************************************
			*
			*
			* 志愿者活动类型
			*
			*
			*******************************************************************************************************************/

			/**
			* 分页查询
			* @param
			* @return
			*/
			@GetMapping("/VolunteerType/volunteerTypeGetList")
			public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam("type") String type);

			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("/VolunteerType/insertvolunteerType")
			public R insertvolunteerType(@RequestBody VolunteerTypeVO volunteerTypeVO);

			/**
			* 更新
			* @param volunteerTypeVO
			* @return
			*/
			@PostMapping("/VolunteerType/volunteerTypeUpdate")
			public R volunteerTypeUpdate(@RequestBody VolunteerTypeVO volunteerTypeVO);

			/**
			* 删除
			* @param id
			* @return
			*/
			@DeleteMapping("/VolunteerType/volunteerTypeDelete")
			public R volunteerTypeDelete(@RequestParam("id") String id);

			/*****************************************************************************************************************
			*
			*
			* 志愿者参加活动
			*
			*
			****************************************************************************************************************/
			/**
			* 志愿者单个详情
			* @param id
			* @return
			*/
			@GetMapping("/VolunteerActivitiesPeople/vapGetById")
			public R vapGetById(@RequestParam("id") String id);

			/**
			* 参与人员列表
			* @param activityId
			* @param communityId
			* @return
			*/
			@GetMapping("/VolunteerActivitiesPeople/vapGetList")
			public R vapGetList(@RequestParam("activityId") String activityId,
			@RequestParam("communityId") String communityId);

			/**
			* 添加参与人员
			* @param volunteerActivitiesPeopleVO
			* @return
			*/
			@PostMapping("/VolunteerActivitiesPeople/vapInsert")
			public R vapInsert(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);

			/**
			* 修改参与人员
			* @param volunteerActivitiesPeopleVO
			* @return
			*/
			@PostMapping("/VolunteerActivitiesPeople/vapUpdate")
			public R vapUpdate(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);

			/**
			* 删除参与人员
			* @param id
			* @return
			*/
			@DeleteMapping("/VolunteerActivitiesPeople/vapDelete")
			public R vapDelete(@RequestParam("id") String id);


			/**
			* 志愿者活动奖励发放
			* @param grantIntegral
			* @return
			*/
			@PostMapping("/VolunteerActivitiesPeople/grantIntegral")
			public R grantIntegral(@RequestBody GrantIntegral grantIntegral);

			/**************************************************************************************************************
			*
			*
			* 积分明细记录
			*
			*****************************************************************************************************************/
			/**
			* 获取单个详情
			*
			* @param id
			* @return
			*/
			@GetMapping("/VolunteerIntegralRecord/getId")
			public R VolunteerIntegralRecordGetId(@RequestParam("id") String id);

			/**
			* 分页查询
			*
			* @param
			* @return
			*/
			@GetMapping("/VolunteerIntegralRecord/getList")
			public R VolunteerIntegralRecordGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam("userId") String userId);

			/**
			* 新增
			*
			* @param
			* @return
			*/
			@PostMapping("/VolunteerIntegralRecord/insertVolunteer")
			public R VolunteerIntegralRecordInsertVolunteer(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);

			/**
			* 便捷
			* @param
			* @return
			*/
			@PostMapping("/VolunteerIntegralRecord/updateId")
			public R VolunteerIntegralRecordUpdateId(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);

			/**
			* 删除
			* @param id
			* @return
			*/
			@DeleteMapping("/VolunteerIntegralRecord/deleteId")
			public R VolunteerIntegralRecordDeleteId(@RequestParam("id") String id);

			/*************************************************************************************************************
			*
			*
			* 路北社区积分商城
			*
			*
			****************************************************************************************************************/

			/**
			* 获取单个详情
			* @param id
			* @return
			*/
			@GetMapping("/VolunteerIntegralMerchant/queryById")
			public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id);

			/**
			* 分页查询
			* @param
			* @return
			*/
			@GetMapping("/VolunteerIntegralMerchant/queryList")
			public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "name", required = false) String name,
			@RequestParam(value = "state", required = false) String state,
			@RequestParam(value = "goodType", required = false) String goodType,
			@RequestParam(value = "merchantId", required = false) String merchantId);

			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
			public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO);

			@PostMapping("/VolunteerIntegralMerchant/updateById")
			public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);


			@PostMapping("/VolunteerIntegralMerchant/unmount")
			public R VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO);

			@DeleteMapping("/VolunteerIntegralMerchant/deleteById")
			public R VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id);


			/***********************************************************************************************************
			*
			*
			* 订单兑换
			*
			*
			***********************************************************************************************************/

			/**
			* 分页查询
			* @param
			* @return
			*/
			@GetMapping("/VolunteerIntegralMerchant/order/getList")
			public R getList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "goodsId", required = false) String goodsId,
			@RequestParam(value = "orderNumber", required = false) String orderNumber,
			@RequestParam(value = "goodsName", required = false) String goodsName,
			@RequestParam(value = "condition", required = false) String condition,
			@RequestParam(value = "userName", required = false) String userName,
			@RequestParam(value = "communityId", required = false) String communityId,
			@RequestParam(value = "userId", required = false) String userId,
			@RequestParam(value = "orderType", required = false) String orderType,
			@RequestParam(value = "merchantId", required = false) String merchantId);

			/**
			* 查询详情
			* @param id
			* @return
			*/
			@GetMapping("/VolunteerIntegralMerchant/order/getData")
			public R getData(@RequestParam("id") String id);

			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("/VolunteerIntegralMerchant/order/insertData")
			public R insertData(@RequestBody VolunteerCreditsExchangeVO item);

			/**
			* 新增用户购买商家商品记录
			* @param
			* @return
			*/
			@PostMapping("/VolunteerIntegralMerchant/order/insertMerchantData")
			public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item);

			/**
			* 更新
			* @param item
			* @return
			*/
			@PostMapping("/VolunteerIntegralMerchant/order/update")
			public R update(@RequestBody VolunteerCreditsExchangeVO item);

			/**
			* 删除
			* @param id
			* @return
			*/
			@DeleteMapping("/VolunteerIntegralMerchant/order/delete")
			public R delete(@RequestParam("id") String id);

			/**
			* 核销
			* @param id
			* @return
			*/
			@GetMapping("/VolunteerIntegralMerchant/order/conditionData")
			public R conditionData(@RequestParam("id") String id);

			/*****************************************************************************************************************
			*
			*
			* 路北社区商家管理
			*
			*
			*****************************************************************************************************************/
			/**
			* 分页查询
			* @param
			* @return
			*/
			@GetMapping("/VolunteerMerchant/getList")
			public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "merchantState", required = false) String merchantState,
			@RequestParam(value = "merchantType", required = false) String merchantType,
			@RequestParam(value = "name", required = false) String name,
			@RequestParam(value = "communityId", required = false) String communityId);

			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("/VolunteerMerchant/insert")
			public R insertVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);


			@PostMapping("/VolunteerMerchant/update")
			public R updateVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);


			@DeleteMapping("/VolunteerMerchant/delete")
			public R deleteVolunteerMerchant(@RequestParam("id") String id);

			@GetMapping("/VolunteerMerchant/getUser")
			public R volunteerMerchantGetUser(@RequestParam("communityId") String communityId,
			@RequestParam(value = "userName", required = false) String userName,
			@RequestParam(value = "userPhone", required = false)String userPhone);


			@GetMapping("/VolunteerMerchant/getById")
			public R volunteerMerchantGetById(@RequestParam("id") String id);

			/**
			* 是否是商家
			* @param userId
			* @return
			*/
			@GetMapping("/VolunteerMerchant/isMerchant")
			public R isMerchant(@RequestParam("userId") String userId);


			/**
			* 社区取消订单
			* @param id
			* @return
			*/
			@GetMapping("/VolunteerIntegralMerchant/order/communityCancellation")
			public R communityCancellation(@RequestParam("id") String id);





			/****************************************************************************************************************
			*
			* 商家评论
			*
			***************************************************************************************************************/

			/**
			* 商家评论分页查询
			* @param
			* @return
			*/
			@GetMapping("/VolunteerMerchant/evaluate/getList")
			public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam("communityId") String communityId,
			@RequestParam("merchantId") String merchantId);

			/**
			* 商家评论获取详情
			* @param id
			* @return
			*/
			@GetMapping("/VolunteerMerchant/evaluate/getData")
			public R volunteerMerchantGetData(@RequestParam("id") String id);

			/**
			* 商家评论新增评价
			* @return
			*/
			@PostMapping("/VolunteerMerchant/evaluate/insert")
			public R volunteerMerchantInsert(@RequestBody VolunteerMerchantEvaluateVO item);

			/**
			* 商家评论更新评价
			* @return
			*/
			@PostMapping("/VolunteerMerchant/evaluate/update")
			public R volunteerMerchantUpdate(@RequestBody VolunteerMerchantEvaluateVO item);


			/**
			* 商家评论删除评价
			* @param id
			* @return
			*/
			@DeleteMapping("/VolunteerMerchant/evaluate/delete")
			public R volunteerMerchantDelete(@RequestParam("id") String id);



			/***************************************************************************************************************
			*
			* 路北社区商家提现
			*
			****************************************************************************************************************/

			/**
			* 商家提现列表啊
			* @param disposeType
			* @return
			*/
			@GetMapping("/VolunteerMerchant/withdraw/getList")
			public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "disposeType", required = false) String disposeType,
			@RequestParam(value = "merchantName", required = false) String merchantName,
			@RequestParam(value = "merchantId", required = false) String merchantId,
			@RequestParam(value = "communityId", required = false) String communityId);

			/**
			* 新增商家提现
			* @param item
			* @return
			*/
			@PostMapping("/VolunteerMerchant/withdraw/insert")
			public R WithdrawInsert(@RequestBody VolunteerMerchantWithdrawVO item);

			/**
			* 编辑商家提现
			* @param item
			* @return
			*/
			@PostMapping("/VolunteerMerchant/withdraw/update")
			public R WithdrawUpdate(@RequestBody VolunteerMerchantWithdrawVO item);

			/**
			* 删除商家提现
			* @param id
			* @return
			*/
			@GetMapping("/VolunteerMerchant/withdraw/delete")
			public R WithdrawDelete(@RequestParam("id") String id);

			/**
			* 处理商家提现
			* @param id
			* @return
			*/
			@GetMapping("/VolunteerMerchant/withdraw/dispose")
			public R WithdrawDispose(@RequestParam("id") String id);




			/***************************************************************************************************************
			*
			* 路北社区系统配置商家折扣兑换地点信息
			*
			****************************************************************************************************************/

			/**
			* 详情
			* @param
			* @return
			*/
			@GetMapping("/VolunteerMerchant/Community/Config/getData")
			public R ConfiggetData(@RequestParam("communityId") String communityId);

			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("/VolunteerMerchant/Community/Config/insertvo")
			public R Configinsertvo(@RequestBody VolunteerCommunityConfigVO item);



			/*******************************************************************************************************************
			*
			*
			* 社区折扣
			*
			*
			******************************************************************************************************************/


			/**
			* 分页查询
			* @param
			* @return
			*/
			@GetMapping("/VolunteerMerchant/community/discount/getList")
			public R CommunityDiscountgetList(@RequestParam("communityId") String communityId);

			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("/VolunteerMerchant/community/discount/insert")
			public R CommunityDiscountinsert(@RequestBody VolunteerCommunityDiscountVO item);


			@PostMapping("/VolunteerMerchant/community/discount/update")
			public R CommunityDiscountupdate(@RequestBody VolunteerCommunityDiscountVO item);


			@DeleteMapping("/VolunteerMerchant/community/discount/delete")
			public R CommunityDiscountdelete(@RequestParam("id") String id);




			/**
			* 报名/取消报名社区活动
			* 金汇社区专用
			* @param signactivityVO
			* 报名参数
			* @return 报名取消报名结果
			*/
			@PostMapping("/jinhui/jinhuiSignActivity")
			public R jinhuiSignActivity(@RequestBody SignactivityVO signactivityVO);



			/**
			* 用户签到
			* 金汇社区专用
			* @param comActActRegistVO 签到参数
			* @return 签到结果
			*/
			@PostMapping("/jinhui/jinhuiActivitySignIn")
			public R jinhuiActivitySignIn(@RequestBody ComActActRegistVO comActActRegistVO);




			@GetMapping("/integral/user/getIntegralUserRank")
			public R getIntegralUserRank(@RequestParam("communityId") Long communityId,
			@RequestParam("userId") Long userId);


			@GetMapping("/largeScreen/panzhihuaMap")
			public R panzhihuaMap(@RequestParam("areaCode")String areaCode);

			@GetMapping("/largeScreen/oneTagThreeReal")
			public R oneTagThreeReal(@RequestParam("streetId") Long streetId);

			@PostMapping("/largeScreen/searchStreet")
			public R searchStreet(@RequestBody BuildingDto buildingDto);

			@PostMapping("/largeScreen/huachengDyn")
			public R huachengDyn(@RequestBody ComActDynVO comActDynVO);

			@GetMapping("/largeScreen/getScreenStatics")
			public R getScreenStatics();

			@GetMapping("/largeScreen/populationStatics")
			public R populationStatics(@RequestParam("streetId") Long streetId);

			@GetMapping("/largeScreen/probably")
			public R probably(@RequestParam("year") Integer year,@RequestParam("belongTo") String belongTo);
			/**
			* 查询一标三实数据
			*/
			@GetMapping("/largeScreen/sumAreaStreet")
			R<SumAreaStreetResp> sumAreaStreet();


			/**
			* 下拉明细
			*/
			@GetMapping(("/largeScreen/areaStreetDetail"))
			R<AreaStreetDetail> areaStreetDetail(@RequestParam("code") String code,
			@RequestParam("type") String type);

			@GetMapping("/largeScreen/qryReport")
			R<List<QryReportResp>> qryReport(@RequestParam(value = "yearTime",required = false) String yearTime);


			/*****************************************************************************************************************
			*
			* 社区宣传
			*
			******************************************************************************************************************/
			@GetMapping("/sys/conf/getCommunityPublicityData")
			public R getCommunityPublicityData(@RequestParam("communityId") String communityId);

			@PostMapping("/sys/conf/addCommunityPublicityDate")
			public R addCommunityPublicityDate(@RequestBody CommunityPublicityVO item);

			@PostMapping("/sys/conf/editCommunityPublicityDate")
			public R editCommunityPublicityDate(@RequestBody CommunityPublicityVO item);

			@DeleteMapping("/sys/conf/deleteCommunityPublicityData")
			public R deleteCommunityPublicityData(@RequestParam("communityId") String communityId);



			/**
			* 社区活动自动定时更新用户未签退时间
			* @return
			*/
			@GetMapping("/comActAcidRecord/comActActRegistUpdateEndTime")
			public R comActActRegistUpdateEndTime();



			}