合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

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

@@ -3,7 +3,7 @@

import com.java110.community.dao.ICommunityLocationServiceDao;
import com.java110.intf.community.ICommunityLocationInnerServiceSMO;
import com.java110.dto.communityLocation.CommunityLocationDto;
import com.java110.dto.community.CommunityLocationDto;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.user.UserDto;