# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoEditFragment.java
#	app/src/main/res/layout/fragment_user_list.xml

添加字段;

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

添加Accept-Language;
更新版本;