合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java

@@ -520,10 +520,9 @@
        paramInJson.put("communityId", GenerateCodeFactory.getCommunityId());
        paramInJson.put("state", "1000");
        paramInJson.put("communityArea", "0");
        paramInJson.put("createTime", new Date());
        paramInJson.put("bId", "-1");
        CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
        communityInnerServiceSMOImpl.saveCommunity(communityPo);
        super.insert(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMMUNITY_INFO);

    }

    /**
@@ -563,7 +562,9 @@
     * @return 订单服务能够接受的报文
     */
    public void updateCommunityOne(JSONObject paramInJson, DataFlowContext dataFlowContext) {

        CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
        communityInnerServiceSMOImpl.updateCommunity(communityPo);

        super.update(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);
    }
}