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

# 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

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
#	app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java
#	app/src/main/res/layout/fragment_bale_seach.xml
#	app/src/main/res/layout/fragment_bale_seach_shop.xml

修改terId;
展示Ms的条件信息;

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