合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-community/src/main/java/com/java110/community/listener/community/AbstractCommunityBusinessServiceDataFlowListener.java

@@ -45,6 +45,7 @@
        businessCommunityInfo.put("mapY", businessCommunityInfo.get("map_y"));
        businessCommunityInfo.put("state", businessCommunityInfo.get("state"));
        businessCommunityInfo.put("communityArea", businessCommunityInfo.get("community_area"));
        businessCommunityInfo.put("tel", businessCommunityInfo.get("tel"));
        businessCommunityInfo.put("statusCd", statusCd);
    }

@@ -116,6 +117,7 @@
        currentCommunityInfo.put("mapY", currentCommunityInfo.get("map_y"));
        currentCommunityInfo.put("state", currentCommunityInfo.get("state"));
        currentCommunityInfo.put("communityArea", currentCommunityInfo.get("community_area"));
        currentCommunityInfo.put("tel", currentCommunityInfo.get("tel"));

        currentCommunityInfo.put("operate", StatusConstant.OPERATE_DEL);
        getCommunityServiceDaoImpl().saveBusinessCommunityInfo(currentCommunityInfo);