# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
#	app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java
#	app/src/main/res/layout/fragment_bale_seach.xml
#	app/src/main/res/layout/fragment_bale_seach_shop.xml