# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java
#	app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
#	app/src/main/res/layout/activity_statistics_detail.xml