modified:   src/main/java/com/flyhz/framework/lang/SolrData.java
	modified:   src/main/java/com/flyhz/shop/build/solr/SolrDataImpl.java
	modified:   src/main/java/com/flyhz/shop/build/solr/SolrTimer.java
	modified:   src/main/java/com/flyhz/shop/dto/ProductBuildDto.java
	modified:   src/main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
	modified:   src/main/java/com/flyhz/shop/web/controller/BuildController.java
	modified:   src/main/resources/mybatis/sqlmap/ProductMapper.xml
	modified:   src/main/resources/spring/applicationContext-controller.xml
	modified:   src/main/resources/spring/applicationContext-service.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz