# Conflicts:
#	.gitignore
#	CommonLib/Common/src/main/java/com/yidian/common/YdBaseApplication.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt
#	idcard_quality/src/main/AndroidManifest.xml

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

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

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

fix androidx.fragment.app.Fragment$InstantiationException: Unable to instantiate fragment com.yidian.shenghuoquan.commodity.ui.coupon.fragment.CommodityListFragment: could not find Fragment constructor