From fbfd98f72387b567d5de150b3656f540d70c2be1 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 23 七月 2021 11:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
index 50d0666..f1439de 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
@@ -8,6 +8,7 @@
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
 import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.service_community.model.dos.ComMngVillageDO;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
@@ -37,7 +38,7 @@
      * @param villageId 查询条件
      * @return 查询结果
      */
-    R getVillageById(Long villageId);
+    ComMngVillageDO getVillageById(Long villageId);
 
     /**
      * 分页查询实有房屋

--
Gitblit v1.7.1