# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java

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

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

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

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

支付渠道;
BUG修改;

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java
#	app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java