# Conflicts:
#	app/src/main/java/com/xx/merchanthbh/ui/home/HomeFragment.java
#	app/src/main/java/com/xx/merchanthbh/ui/huanbohai/HuanBoHaiFragment.java
#	app/src/main/java/com/xx/merchanthbh/ui/mine/MineFragment.java
#	hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/home/HomeFragment.java