modified:   main/java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile/src/main/java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java

	modified:   main/java/com/flyhz/framework/lang/CacheRepository.java
	modified:   main/java/com/flyhz/framework/lang/RedisRepository.java
	modified:   main/java/com/flyhz/framework/util/Constants.java
	modified:   main/java/com/flyhz/shop/dto/ProductDto.java
	modified:   main/java/com/flyhz/shop/persistence/RCacheRepository.java
	modified:   main/java/com/flyhz/shop/persistence/RedisRepositoryImpl.java
	modified:   main/java/com/flyhz/shop/persistence/dao/ProductDao.java
	modified:   main/java/com/flyhz/shop/service/ShoppingCartService.java
	modified:   main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
	modified:   main/java/com/flyhz/shop/service/impl/ProductServiceImpl.java
	modified:   main/java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java
	modified:   main/java/com/flyhz/shop/web/controller/BuildController.java
	modified:   main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   main/resources/mybatis/sqlmap/CartItemMapper.xml
	modified:   main/resources/mybatis/sqlmap/ProductMapper.xml
	modified:   main/resources/spring/applicationContext-service.xml