Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-23 fbfd98f72387b567d5de150b3656f540d70c2be1

 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;
    }