合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-api/src/main/java/com/java110/api/bmo/parkingSpaceAttr/impl/ParkingSpaceAttrBMOImpl.java

@@ -4,7 +4,7 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.parkingSpaceAttr.IParkingSpaceAttrBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.community.IParkingSpaceAttrInnerServiceSMO;
import com.java110.intf.community.IParkingSpaceAttrInnerServiceSMO;
import com.java110.po.parkingSpaceAttr.ParkingSpaceAttrPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.BeanConvertUtil;