# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
#	app/src/main/res/values/styles.xml

添加商品维护代码;

# Conflicts:
#	app/src/main/AndroidManifest.xml

优化开单和收款的流程和结构;

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java

优化开单和收款的流程和结构;

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/GroupCateView.java

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