modified:   ../../smile/src/main/java/com/flyhz/framework/lang/SolrData.java
	modified:   ../../smile/src/main/java/com/flyhz/framework/util/Constants.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/build/solr/SolrDataImpl.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/build/solr/SolrTimer.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/dto/ProductBuildDto.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/service/BuildService.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/web/controller/BuildController.java
	modified:   ../../smile/src/main/resources/mybatis/sqlmap/BrandMapper.xml
	modified:   ../../smile/src/main/resources/mybatis/sqlmap/ProductMapper.xml
	modified:   ../res/layout/login.xml
	modified:   com/holding/smile/activity/BaseActivity.java
	modified:   com/holding/smile/activity/LoginActivity.java
	modified:   com/holding/smile/activity/MainTwoActivity.java
	modified:   com/holding/smile/activity/RegisterActivity.java
	modified:   com/holding/smile/activity/SearchGoodsActivity.java
	modified:   com/holding/smile/activity/ShoppingCartActivity.java
	modified:   com/holding/smile/service/DataService.java
	modified:   ../../smile_nodejs/requestHandlers.js
Merge branch 'master' of https://github.com/rememberlostcode/flyhz