# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/C.java

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/C.java

完成换购的前期工作;
添加支付的lib;

# Conflicts:
#	app/src/main/res/layout/item_vip_expense_item.xml