modified:   smile/src/main/java/com/flyhz/shop/build/solr/SolrDataImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/dto/ProductBuildDto.java
	modified:   smile/src/main/java/com/flyhz/shop/persistence/dao/IdcardDao.java
	modified:   smile/src/main/java/com/flyhz/shop/persistence/entity/IdcardModel.java
	modified:   smile/src/main/java/com/flyhz/shop/service/IdcardService.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/IdcardServiceImpl.java
	new file:   smile/src/main/java/com/flyhz/shop/web/controller/IdcardController.java
	modified:   smile/src/main/resources/mybatis/sqlMapConfig.xml
	new file:   smile/src/main/resources/mybatis/sqlmap/IdcardMapper.xml
	modified:   smile/src/main/resources/mybatis/sqlmap/ProductMapper.xml
	modified:   smile/src/main/resources/spring/applicationContext-dao.xml
	modified:   smile_android/res/layout/idcard_edit.xml
	modified:   smile_android/res/values/url.xml
	modified:   smile_android/src/com/holding/smile/activity/IdcardEditActivity.java
	modified:   smile_android/src/com/holding/smile/entity/Idcard.java
	modified:   smile_android/src/com/holding/smile/service/DataService.java
	modified:   smile_android/src/com/holding/smile/service/SubmitService.java
	new file:   smile_android/src/com/holding/smile/tools/FileUtils.java
	new file:   smile_android/src/com/holding/smile/tools/FormFile.java
	modified:   smile_nodejs/requestHandlers.js
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/service/DataService.java

	new file:   smile_android/res/layout/color_item.xml
	modified:   smile_android/res/layout/goods_detail_view.xml
	modified:   smile_android/src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MainActivity.java
	new file:   smile_android/src/com/holding/smile/adapter/ColorAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/ImageAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/MyPagerAdapter.java
	modified:   smile_android/src/com/holding/smile/cache/ImageLoader.java
	new file:   smile_android/src/com/holding/smile/entity/JColor.java
	modified:   smile_android/src/com/holding/smile/entity/JGoods.java
	modified:   smile_android/src/com/holding/smile/myview/MyGridView.java
	modified:   smile_android/src/com/holding/smile/myview/MyLinearLayout.java