合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-community/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java

@@ -151,15 +151,11 @@
        return communityServiceDaoImpl.queryCommunitysCount(BeanConvertUtil.beanCovertMap(communityDto));
    }

    @Override
    public int saveCommunity(@RequestBody CommunityPo communityPo) {
        return communityServiceDaoImpl.saveCommunity(BeanConvertUtil.beanCovertMap(communityPo));
    }
//    @Override
//    public int saveCommunity(@RequestBody CommunityPo communityPo) {
//        return communityServiceDaoImpl.saveCommunity(BeanConvertUtil.beanCovertMap(communityPo));
//    }

    @Override
    public int updateCommunity(@RequestBody CommunityPo communityPo) {
        return communityServiceDaoImpl.updateCommunity(BeanConvertUtil.beanCovertMap(communityPo));
    }

    public ICommunityServiceDao getCommunityServiceDaoImpl() {
        return communityServiceDaoImpl;