Merge remote-tracking branch 'origin/master'

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

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/EditorFragment.java

@@ -24,7 +24,6 @@ import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
 import com.xingdata.zzdpos.ui.marketing.ms.model.User;
 import com.xingdata.zzdpos.ui.marketing.ms.view.BaseGroupView;
 import com.xingdata.zzdpos.ui.marketing.ms.view.GroupAllView;
-import com.xingdata.zzdpos.ui.marketing.ms.view.GroupCateView;
 import com.xingdata.zzdpos.ui.marketing.ms.view.GroupSkuView;
 import com.xingdata.zzdpos.util.ConvertUtil;