From faa40222f2e15b68a89d2180b57d444de5b67709 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期一, 31 五月 2021 13:18:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java index c828aa0..583c45e 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java @@ -195,6 +195,16 @@ R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId); /** + * 随手拍删除 + * + * @param id 随手拍主键 + * @param userId 登录用户id + * @return 详情内容 + */ + @PostMapping("deleteEasyPhoto") + R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId); + + /** * 分页查询微心愿 * * @param comActMicroWishVO 查询参数 @@ -1179,7 +1189,7 @@ R deleteOpsHouse(@RequestParam("id") Long id); /** - * 一起议-分页查询 + * 房屋租售-分页查询 * * @param pageComOpsHouseDTO 查询参数 * @return ComOpsHouseVO @@ -1349,7 +1359,7 @@ * @param list 便民服务集合 */ @PostMapping("/convenient/serve/import") - R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam("communityId") Long communityId); + R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam(value = "communityId",required = false) Long communityId); /** * 导出房屋信息 @@ -2631,4 +2641,11 @@ */ @PostMapping("/vaccines/admin/inoculation/export") R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO); + + /** + * 查询疫苗分类列表 + * @return 疫苗分类列表 + */ + @PostMapping("/vaccines/admin/enroll/type/list") + R getEnrollTypeListByAdmin(); } -- Gitblit v1.7.1