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