From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突

---
 service-community/src/main/java/com/java110/community/listener/community/AbstractCommunityBusinessServiceDataFlowListener.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/listener/community/AbstractCommunityBusinessServiceDataFlowListener.java b/service-community/src/main/java/com/java110/community/listener/community/AbstractCommunityBusinessServiceDataFlowListener.java
index 6e23cd7..6a57938 100644
--- a/service-community/src/main/java/com/java110/community/listener/community/AbstractCommunityBusinessServiceDataFlowListener.java
+++ b/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);

--
Gitblit v1.8.0