modified:   smile/src/main/java/com/flyhz/shop/build/solr/SolrDataImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/dto/BrandDto.java
	modified:   smile_android/src/com/holding/smile/activity/MyOrdersActivity.java
	modified:   smile_android/src/com/holding/smile/activity/PhoneActivity.java
	modified:   smile_android/src/com/holding/smile/activity/RegisterActivity.java
	modified:   smile_android/src/com/holding/smile/activity/ResetPwdActivity.java
	modified:   smile_android/src/com/holding/smile/tools/StrUtils.java