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/impl/ComMngVillageServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
index 068ea18..f20275f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -94,13 +94,10 @@
}
@Override
- public R getVillageById(Long villageId) {
+ public ComMngVillageDO getVillageById(Long villageId) {
ComMngVillageDO comMngVillageDO = new ComMngVillageDO();
comMngVillageDO = comActVillageDAO.selectById(villageId);
- if (comMngVillageDO != null) {
- return R.ok(comMngVillageDO);
- }
- return R.fail();
+ return comMngVillageDO;
}
--
Gitblit v1.7.1