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

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

添加营销计划管理页面;