# Conflicts:
#	CommonLib/BCommon/src/main/java/com/yidian/bcommon/bean/LocalUploadImageBean.kt
#	CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/ImageService.kt
#	CommonLib/BCommon/src/main/res/drawable-xxhdpi/bg_launcher.9.png
#	CommonLib/BCommon/src/main/res/drawable-xxhdpi/icon_launcher_bg.png
#	Components/BRoot/src/main/res/layout/activity_flash.xml
#	Components/BXBridBusiness/src/main/assets/www
#	Components/BXBridBusiness/src/main/java/com/yidian/shenghuoquan/bxbirdbusiness/ui/CommonWebViewActivity.kt

Merge branch 'feature/dev_order' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into feature/dev_order

项目整体搭建完成

# Conflicts:
#	README.md