From ec76ed1ea86e13cd76dc99ec0dfdf657d34919a5 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 11 五月 2021 09:15:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 e4339a4..a9492dc 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
@@ -34,6 +34,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -758,7 +759,7 @@
      *
      * @return
      */
-    @PostMapping("timedtaskactmicrowishall")
+    @PostMapping("timedtaskactmicrowish")
     R timedTaskActMicroWishAll();
 
     /**
@@ -2427,4 +2428,12 @@
     @PostMapping("/neighbor/neighborCommentReplyByApp")
     R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO);
 
+    /**
+     * 实有房屋_编辑
+     * @param villageId 实有房屋id
+     * @param comMngVillageVO 请求参数
+     * @return
+     */
+    @PostMapping("/editvillage/{villageId}")
+    R editvillage(@PathVariable("villageId") Long villageId,@RequestBody ComMngVillageVO comMngVillageVO);
 }

--
Gitblit v1.7.1