java/zhihuishenqu.git

			@@ -2,10 +2,24 @@

			import java.util.List;

			import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
			import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
			import com.panzhihua.common.model.dtos.community.*;
			import com.panzhihua.common.model.dtos.community.building.admin.*;
			import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
			import com.panzhihua.common.model.dtos.community.cluster.admin.*;
			import com.panzhihua.common.model.dtos.property.CommonPage;
			import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
			import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
			import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
			import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
			import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
			import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
			import com.panzhihua.common.model.dtos.neighbor.*;
			import com.panzhihua.common.model.vos.community.*;
			import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
			import io.swagger.annotations.ApiOperation;
			import com.panzhihua.common.model.vos.community.*;
			import org.springframework.cloud.openfeign.FeignClient;
			import org.springframework.web.bind.annotation.DeleteMapping;
			import org.springframework.web.bind.annotation.GetMapping;
			@@ -19,6 +33,84 @@
			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.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.PageComStreetDTO;
			import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
			import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
			import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
			import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
			import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
			import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
			import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
			import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
			import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
			import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
			@@ -28,25 +120,68 @@
			import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
			import com.panzhihua.common.model.dtos.community.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.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.questnaire.StatisticsSummaryDTO;
			import com.panzhihua.common.model.dtos.community.reserve.*;
			import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
			import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
			import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
			import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
			import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
			import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
			import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
			import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
			import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
			import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
			import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
			import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
			import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
			import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
			import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
			import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
			import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
			import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
			import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
			import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
			import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
			import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
			import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
			import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
			@@ -65,6 +200,7 @@
			import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
			import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborAddBrowseAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
			@@ -75,8 +211,10 @@
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborFabulousAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborForwardAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborReplyAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
			import com.panzhihua.common.model.dtos.property.CommonPage;
			import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
			@@ -109,14 +247,77 @@
			import com.panzhihua.common.model.vos.DictionaryVO;
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
			import com.panzhihua.common.model.vos.community.ActivitySignVO;
			import com.panzhihua.common.model.vos.community.BatchhouseVO;
			import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
			import com.panzhihua.common.model.vos.community.ComActActRegistVO;
			import com.panzhihua.common.model.vos.community.ComActActivityVO;
			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.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.questnaire.EditComActQuestnaireVo;
			import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
			import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
			import com.panzhihua.common.model.vos.community.reserve.*;
			import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
			import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
			import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
			import com.panzhihua.common.model.vos.community.warehouse.WarehouseDonatesExcelVO;
			import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
			import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
			import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
			@@ -205,7 +406,7 @@
			* @return 详情
			*/
			@PostMapping("detailactivity")
			R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);
			R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId,@RequestParam(value = "pageNum", required = false) Long pageNum,@RequestParam(value = "pageSize", required = false) Long pageSize);

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

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

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

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

			/**
			* 心愿详情
			@@ -1133,7 +1353,7 @@
			R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO);

			/**
			* 一起议-新增
			* 议事投票-新增
			*
			* @param comActDiscussDTO
			* 新增参数
			@@ -1143,17 +1363,35 @@
			R addDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);

			/**
			* 一起议-详情
			* 议事投票-新增
			*
			* @param id
			* 主键
			* @param comActDiscussDTO
			* 新增参数
			* @return 新增结果
			*/
			@PostMapping("editdiscuss")
			R editDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);

			/**
			* 议事投票-详情
			*
			* @param discussDetailDTO
			* 请求参数
			* @return ComActDiscussVO
			*/
			@PostMapping("detaildiscuss")
			R detailDiscuss(@RequestParam("id") Long id);
			R detailDiscuss(@RequestBody ComActDiscussDetailDTO discussDetailDTO);

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

			/**
			* 议事投票-删除
			*
			* @param id
			* 主键
			@@ -1163,7 +1401,7 @@
			R deleteDiscuss(@RequestParam("id") Long id);

			/**
			* 一起议-回复
			* 议事投票-回复
			*
			* @param comActDiscussCommentDTO
			* 评论内容
			@@ -1173,7 +1411,7 @@
			R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);

			/**
			* 一起议-分页查询
			* 议事投票-分页查询
			*
			* @param pageComActDiscussDTO
			* 查询参数
			@@ -1183,7 +1421,17 @@
			R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

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

			/**
			* 议事投票-评论-查看
			*
			* @param id
			* 主键
			@@ -1193,7 +1441,15 @@
			R detailDiscussComment(@RequestParam("id") Long id);

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

			/**
			* 议事投票-评论-置顶
			*
			* @param id
			* 主键
			@@ -1203,7 +1459,7 @@
			R putDiscussCommentTop(@RequestParam("id") Long id);

			/**
			* 一起议-评论-回复
			* 议事投票-评论-回复
			*
			* @param comActDiscussCommentDTO
			* 回复内容
			@@ -1213,7 +1469,7 @@
			R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);

			/**
			* 一起议-评论-分页查询
			* 议事投票-评论-分页查询
			*
			* @param pageComActDiscussCommentDTO
			* 分页查询参数
			@@ -1223,7 +1479,17 @@
			R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

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

			/**
			* 议事投票-分页查询小程序
			*
			* @param pageComActDiscussDTO
			* 查询参数
			@@ -1233,7 +1499,7 @@
			R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

			/**
			* 一起议-点赞、取消点赞
			* 议事投票-点赞、取消点赞
			*
			* @param comActDiscussUserDTO
			* 操作类型
			@@ -1243,7 +1509,7 @@
			R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO);

			/**
			* 一起议-评论-分页查询小程序
			* 议事投票-评论-分页查询小程序
			*
			* @param pageComActDiscussCommentDTO
			* 分页参数
			@@ -1253,7 +1519,7 @@
			R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

			/**
			* 一起议-详情小程序
			* 议事投票-详情小程序
			*
			* @param id
			* 主键
			@@ -1265,7 +1531,7 @@
			R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

			/**
			* 一起议-投票
			* 议事投票-投票
			*
			* @param comActDiscussOptionUserDTO
			* 投票信息
			@@ -1275,7 +1541,7 @@
			R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);

			/**
			* 一起议-评论-点赞、取消点赞
			* 议事投票-评论-点赞、取消点赞
			*
			* @param comActDiscussUserDTO
			* 评论点赞
			@@ -1450,7 +1716,7 @@
			R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);

			/**
			* 一起议-新增
			* 议事投票-新增
			*
			* @param comOpsHouseDTO
			* 新增参数
			@@ -1460,7 +1726,7 @@
			R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO);

			/**
			* 一起议-详情
			* 议事投票-详情
			*
			* @param id
			* 主键
			@@ -1500,7 +1766,7 @@
			R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO);

			/**
			* 一起议-删除
			* 议事投票-删除
			*
			* @param id
			* 主键
			@@ -1694,7 +1960,7 @@
			*/
			@PostMapping("/convenient/serve/import")
			R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,
			@RequestParam(value = "communityId", required = false) Long communityId);
			@RequestParam(value = "communityId", required = false) Long communityId);

			/**
			* 导出房屋信息
			@@ -1810,7 +2076,7 @@
			*/
			@PostMapping("/common/data/company/import")
			R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list,
			@RequestParam("communityId") Long communityId);
			@RequestParam("communityId") Long communityId);

			/**
			* 实有单位导出
			@@ -1865,7 +2131,7 @@
			*/
			@PostMapping("/common/data/assets/import")
			R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list,
			@RequestParam("communityId") Long communityId);
			@RequestParam("communityId") Long communityId);

			/**
			* 实有单位导出
			@@ -2013,7 +2279,7 @@
			*/
			@PostMapping("/village/import")
			R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list,
			@RequestParam(value = "communityId") Long communityId);
			@RequestParam(value = "communityId") Long communityId);

			/**
			* 批量导入实有人口
			@@ -2026,7 +2292,7 @@
			*/
			@PostMapping("/common/data/population/import")
			R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入吸毒人员
			@@ -2039,7 +2305,7 @@
			*/
			@PostMapping("/common/data/population/importDrug")
			R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入社区矫正人员
			@@ -2052,7 +2318,7 @@
			*/
			@PostMapping("/common/data/population/importCorrect")
			R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入重精人员
			@@ -2065,7 +2331,7 @@
			*/
			@PostMapping("/common/data/population/importMajor")
			R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入邪教人员
			@@ -2078,7 +2344,7 @@
			*/
			@PostMapping("/common/data/population/importCult")
			R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入刑释人员
			@@ -2091,7 +2357,7 @@
			*/
			@PostMapping("/common/data/population/importRehabilitation")
			R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入重点上访人员
			@@ -2104,7 +2370,7 @@
			*/
			@PostMapping("/common/data/population/importKey")
			R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入服刑人员
			@@ -2117,7 +2383,7 @@
			*/
			@PostMapping("/common/data/population/importSentence")
			R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入退役军人
			@@ -2130,7 +2396,7 @@
			*/
			@PostMapping("/common/data/population/importVeterans")
			R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入残疾人
			@@ -2143,7 +2409,7 @@
			*/
			@PostMapping("/common/data/population/importDisability")
			R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

			/**
			* 批量导入低保户
			@@ -2156,7 +2422,57 @@
			*/
			@PostMapping("/common/data/population/importLowSecurity")
			R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list,
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
			@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

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

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

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

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

			/**
			* 确认导入实有人口（有则更新，无则新建）
			@@ -2169,7 +2485,7 @@
			*/
			@PostMapping("/common/data/population/import/confirm")
			R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list,
			@RequestParam(value = "communityId") Long communityId);
			@RequestParam(value = "communityId") Long communityId);

			/**
			* 分页查询实有人口
			@@ -2182,6 +2498,12 @@
			R pagePopulation(ComMngPopulationDTO comMngPopulationVO);

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

			/**
			* 根据id实有人口详细信息
			*
			* @param populationId
			@@ -2189,7 +2511,7 @@
			* @return 实有人口详细信息
			*/
			@PostMapping("/common/data/population/detail")
			R<ComMngPopulationVO> detailPopulation(@RequestParam(value = "populationId") Long populationId);
			R<ComMngPopulationVO> detailPopulation(@RequestParam(value = "populationId") Long populationId, @RequestParam(value = "communityId") Long communityId);

			/**
			* 根据id查询实有人口电子档案信息
			@@ -2214,12 +2536,12 @@
			/**
			* 批量删除实有人口
			*
			* @param Ids
			* @param ids
			* 实有人口id集合
			* @return 删除结果
			*/
			@PostMapping("/common/data/population/delete")
			R deletePopulations(@RequestBody List<Long> Ids);
			R deletePopulations(@RequestBody List<Long> ids,@RequestParam("communityId") Long communityId);

			/**
			* 根据社区id查询所有实有人口
			@@ -2329,7 +2651,7 @@

			/**
			* 小程序-问卷调查详情
			*
			*
			* @param userId
			* 用户id
			* @param questId
			@@ -2341,7 +2663,7 @@

			/**
			* 小程序-新增问卷调查浏览数量
			*
			*
			* @param questId
			* 问卷调查id
			* @return 增加结果
			@@ -2351,7 +2673,7 @@

			/**
			* 小程序-用户弹窗添加不在提醒接口
			*
			*
			* @param questId
			* 问卷id
			* @param userId
			@@ -2363,7 +2685,7 @@

			/**
			* 社区后台-查询问卷调查详情
			*
			*
			* @param questId
			* 问卷id
			* @return 问卷调查详情
			@@ -2887,7 +3209,7 @@
			*/
			@PostMapping("/common/data/population/edit")
			R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO,
			@RequestParam("communityId") Long communityId);
			@RequestParam("communityId") Long communityId);

			/**
			* 微心愿删除
			@@ -2915,7 +3237,7 @@
			* @return 删除结果
			*/
			@PostMapping("common/data/special/delete")
			R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
			R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam("communityId") Long communityId);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

			/**
			* 分页查询养老金人员认证记录 pagePensionAuthRecords 分页查询养老金人员认证记录
			* @param pageElderAuthRecordsDTO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/9/07 14:03
			*/
			@PostMapping("/elders/pensionAuthRecords/page")
			R pagePensionAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);

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

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

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

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

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

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

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

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

			/**
			@@ -3578,7 +4100,7 @@
			*/
			@PostMapping("/eldersauthelderly/batchSave")
			R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,
			@RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy);
			@RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy);

			/**
			* 批量保存楼栋
			@@ -3589,7 +4111,7 @@
			*/
			@PostMapping("/building/batchSave")
			R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,
			@RequestParam("communityId") Long communityId);
			@RequestParam("communityId") Long communityId);

			/**
			* 插入字典
			@@ -3769,7 +4291,7 @@
			*/
			@PostMapping("/bigscreen/party/ageGender")
			R<BigScreenStatisticAgeGender>
			ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
			ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);

			/**
			* 党建数据概览
			@@ -3794,7 +4316,7 @@
			*/
			@PostMapping("/bigscreen/party/bigscreenPartyactivity")
			R<List<BigScreenStatisticPartyActivity>>
			bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
			bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);

			/**
			* 首页大屏统计接口
			@@ -3842,7 +4364,7 @@
			R activity(@RequestParam("communityId") Long communityId);

			/**
			* 大屏统计一起议
			* 大屏统计议事投票
			*
			* @param communityId
			* @return
			@@ -3910,11 +4432,11 @@
			R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);

			/**
			* 工作大屏-一起议列表
			* 工作大屏-议事投票列表
			*
			* @param discussListDTO
			* 请求参数
			* @return 一起议列表
			* @return 议事投票列表
			*/
			@PostMapping("/screen/work/getScreenDiscussList")
			R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);
			@@ -4313,7 +4835,7 @@

			/**
			* 查询用户交易记录总额
			*
			*
			* @param pageTradeAdminDTO
			* 请求参数
			* @return 交易记录总额
			@@ -4323,7 +4845,7 @@

			/**
			* 查询用户导出数据
			*
			*
			* @param pageTradeAdminDTO
			* 请求参数
			* @return 用户导出数据
			@@ -4333,7 +4855,7 @@

			/**
			* 导出奖励台账数据
			*
			*
			* @param pageTradeAdminDTO
			* 请求参数
			* @return 奖励台账数据
			@@ -4343,7 +4865,7 @@

			/**
			* 查询社区统计数据
			*
			*
			* @param pageTradeAdminDTO
			* 查询社区统计数据
			* @return 社区统计数据
			@@ -4353,7 +4875,7 @@

			/**
			* 社区随手拍列表统计
			*
			*
			* @param communityId
			* 社区id
			* @return 统计结果
			@@ -4399,7 +4921,7 @@
			* @return 邻里圈话题列表
			*/
			@GetMapping("/neighbor/getNeighborTopicByApp")
			R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);
			R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);

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

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

			/**
			* 分页查询退役军人列表
			@@ -4492,6 +5022,17 @@
			R getUserReward(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

			/**
			* 获取首页弹窗接口
			* @param userId
			* 用户id
			* @param communityId
			* 社区id
			* @return 首页弹窗接口
			*/
			@PostMapping("/easyphoto/getUserRewards")
			R getUserRewards(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

			/**
			* 读取用户随手拍奖励
			*
			* @param userId
			@@ -4522,6 +5063,16 @@
			R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);

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

			/**
			* 根据巡查记录id查询详情
			*
			* @param patrolRecordId
			@@ -4542,6 +5093,16 @@
			R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

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

			/**
			* 根据安全工作记录id查询详情
			*
			* @param safetyWorkRecordId
			@@ -4550,7 +5111,7 @@
			*/
			@GetMapping("/patrolRecord/safetyWorkRecord/detail")
			R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId,
			@RequestParam(value = "communityId", required = false) Long communityId);
			@RequestParam(value = "communityId", required = false) Long communityId);

			/**
			* 根据巡查记录id查询安全工作记录详情
			@@ -4561,7 +5122,7 @@
			*/
			@GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
			R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId,
			@RequestParam(value = "communityId", required = false) Long communityId);
			@RequestParam(value = "communityId", required = false) Long communityId);

			/**
			* 分页查询隐患报告
			@@ -4572,6 +5133,16 @@
			*/
			@PostMapping("/patrolRecord/dangerReport/page")
			R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

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

			/**
			* 根据隐患报告id查询详情
			@@ -4632,7 +5203,7 @@

			/**
			* 小程序-查询积分说明
			*
			*
			* @return 积分说明
			*/
			@GetMapping("/integral/explain/applets")
			@@ -4640,7 +5211,7 @@

			/**
			* 小程序-用户查询当前社区可领取积分规则列表
			*
			*
			* @param userId
			* 用户id
			* @param communityId
			@@ -4652,7 +5223,7 @@

			/**
			* 小程序-查询用户积分列表
			*
			*
			* @param userId
			* 用户id
			* @return 用户积分列表
			@@ -4662,7 +5233,7 @@

			/**
			* 小程序-查询社区积分账户排行榜
			*
			*
			* @param communityRankDTO
			* 请求参数
			* @return 社区积分账户排行榜
			@@ -4672,7 +5243,7 @@

			/**
			* 小程序-查询用户社区积分明细
			*
			*
			* @param communityTradeDTO
			* 请求参数
			* @return 用户社区积分明细
			@@ -4682,7 +5253,7 @@

			/**
			* 社区后台-根据社区id查询社区下积分规则列表
			*
			*
			* @param integralRuleDTO
			* 请求参数
			* @return 社区下积分规则列表
			@@ -4692,7 +5263,7 @@

			/**
			* 社区后台-编辑社区积分规则
			*
			*
			* @param integralRuleDTO
			* 请求参数
			* @return 编辑结果
			@@ -4702,7 +5273,7 @@

			/**
			* 社区后台-分页查询社区下积分明细记录
			*
			*
			* @param integralRuleDTO
			* 请求参数
			* @return 社区下积分明细记录
			@@ -4712,7 +5283,7 @@

			/**
			* 给用户添加积分
			*
			*
			* @param integralUserDTO
			* 请求参数
			* @return 添加积分结果
			@@ -4722,7 +5293,7 @@

			/**
			* 根据社区活动id查询社区活动报名人员列表
			*
			*
			* @param activityId
			* 活动id
			* @return 社区活动报名人员列表
			@@ -4742,7 +5313,7 @@

			/**
			* 根据id查询值班表
			*
			*
			* @param rotaId
			* 值班表id
			* @return 值班表详情
			@@ -4762,7 +5333,7 @@

			/**
			* 批量删除值班表
			*
			*
			* @param rotaIds
			* 值班ids
			* @return 删除结果
			@@ -4809,7 +5380,7 @@

			/**
			* 查询社区所有列表
			*
			*
			* @return 社区列表
			*/
			@GetMapping("/switch/community/all/list")
			@@ -4817,7 +5388,7 @@

			/**
			* 根据名字查询所有社区列表
			*
			*
			* @param name
			* 社区名字
			* @return 社区列表
			@@ -4827,7 +5398,7 @@

			/**
			* 根据经纬度以及距离搜索附近社区列表
			*
			*
			* @param communityDTO
			* 请求参数
			* @return 社区列表
			@@ -4837,7 +5408,7 @@

			/**
			* 问卷调查统计汇总
			*
			*
			* @param summaryDTO
			* 请求参数
			* @return 统计汇总
			@@ -4847,7 +5418,7 @@

			/**
			* 问卷调查统计汇总导出数据查询
			*
			*
			* @param questId
			* 调查问卷id
			* @return 调查统计汇总导出数据
			@@ -4857,7 +5428,7 @@

			/**
			* 问卷调查统计汇总表头统计
			*
			*
			* @param questId
			* 调查问卷id
			* @return 问卷调查统计汇总表头统计数据
			@@ -4867,7 +5438,7 @@

			/**
			* 运营后台-新增随手拍分类
			*
			*
			* @param addPhotoClassify
			* 请求参数
			* @return 新增结果
			@@ -4877,7 +5448,7 @@

			/**
			* 运营后台-编辑随手拍分类
			*
			*
			* @param addPhotoClassify
			* 请求参数
			* @return 编辑结果
			@@ -4887,7 +5458,7 @@

			/**
			* 运营后台-分页查询随手拍分类
			*
			*
			* @param addPhotoClassify
			* 请求参数
			* @return 随手拍分类列表
			@@ -4897,7 +5468,7 @@

			/**
			* 运营后台-随手拍分类详情
			*
			*
			* @param id
			* 随手拍分类id
			* @return 随手拍分类
			@@ -4907,7 +5478,7 @@

			/**
			* 运营后台-随手拍分类删除
			*
			*
			* @param id
			* 随手拍分类id
			* @return 删除结果
			@@ -4917,7 +5488,7 @@

			/**
			* 运营后台-查询随手拍分类列表
			*
			*
			* @return 随手拍分类列表
			*/
			@GetMapping("/classify/admin/list")
			@@ -4925,7 +5496,7 @@

			/**
			* 社区后台-切换随手拍公示状态
			*
			*
			* @param comActEasyPhotoVO
			* 请求参数
			* @return 切换结果
			@@ -4935,7 +5506,7 @@

			/**
			* 查询社区待处理随手拍id集合
			*
			*
			* @param communityId
			* 社区id
			* @return 社区待处理随手拍id集合
			@@ -5123,11 +5694,12 @@

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

			/**
			* 查询预约登记题目列表
			@@ -5193,6 +5765,281 @@
			*/
			@PostMapping("/activity/default-praise")
			R timedTaskActivityDefaultPraise();

			/**
			* 小程序-用户新增话题
			* @param circleTopicAppDTO 请求参数
			* @return 新增结果
			*/
			@PostMapping("/neighbor/addNeighborTopicByApp")
			R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO);

			/**
			* 小程序-删除邻里圈
			* @param circleTopicAppDTO 请求参数
			* @return 删除结果
			*/
			@PostMapping("/neighbor/deleteNeighborByApp")
			R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);

			/**
			* 获取系统配置value
			* @param key 系统配置code
			* @param communityId 社区id
			* @return 系统配置value
			*/
			@GetMapping("/sys/conf/getSysConfValue")
			R getSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId);

			/**
			* 新增系统配置
			* @param key 系统配置code
			* @param communityId 社区id
			* @param name 系统配置名称
			* @param value 系统配置value
			* @return 新增结果
			*/
			@GetMapping("/sys/conf/addSysConfValue")
			R addSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId,@RequestParam("name") String name,@RequestParam("value") String value);

			/**
			* 编辑系统配置
			* @param communityId 社区id
			* @param status 配置值
			* @return 编辑结果
			*/
			@GetMapping("/sys/conf/editSysConfValue")
			R editSysConfValue(@RequestParam("communityId") Long communityId,@RequestParam("status") Integer status);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

			/**
			* 分页查询所有数据
			@@ -5263,4 +6110,1020 @@
			*/
			@GetMapping("/comActCommittee/del")
			R comActCommitteeDelete(@RequestParam("id") Long id);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

			/**
			* 社区后台分页查询微心愿
			* @param comActMicroWishVO 请求参数
			* @return 微心愿列表
			*/
			@PostMapping("pagemicrowishAdmin")
			R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

			/**
			* 养老认证添加
			*
			* @param comElderAuthRecordVO
			* @return
			*/
			@PostMapping("/elders/pensionAuthRecord/add")
			R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
			}