# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
#	app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java