合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-api/src/main/java/com/java110/api/listener/communityLocation/ListCommunityLocationsListener.java

@@ -6,7 +6,7 @@
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.intf.community.ICommunityLocationInnerServiceSMO;
import com.java110.dto.communityLocation.CommunityLocationDto;
import com.java110.dto.community.CommunityLocationDto;
import com.java110.vo.ResultVo;
import com.java110.utils.constant.ServiceCodeCommunityLocationConstant;
import com.java110.utils.util.Assert;