modified:   main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	new file:   main/resources/contentType.properties
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

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

  It looks like you may be committing a merge.
  If this is not correct, please remove the file
 	.git/MERGE_HEAD
  and try again.

  Please enter the commit message for your changes. Lines starting
  with ' ' will be ignored, and an empty message aborts the commit.
  On branch master
  Your branch and 'origin/master' have diverged,
  and have 2 and 3 different commits each, respectively.
    (use "git pull" to merge the remote branch into yours)

  All conflicts fixed but you are still merging.

  Changes to be committed:
 	modified:   main/java/com/flyhz/framework/lang/Protocol.java
 	renamed:    main/java/com/flyhz/shop/dto/Brand.java -> main/java/com/flyhz/shop/dto/BrandDto.java
 	renamed:    main/java/com/flyhz/shop/dto/CartItem.java -> main/java/com/flyhz/shop/dto/CartItemDto.java
 	deleted:    main/java/com/flyhz/shop/dto/ConsigneeDetail.java
 	new file:   main/java/com/flyhz/shop/dto/ConsigneeDetailDto.java
 	renamed:    main/java/com/flyhz/shop/dto/Consignee.java -> main/java/com/flyhz/shop/dto/ConsigneeDto.java
 	renamed:    main/java/com/flyhz/shop/dto/Voucher.java -> main/java/com/flyhz/shop/dto/CouponDto.java
 	renamed:    main/java/com/flyhz/shop/dto/Identitycard.java -> main/java/com/flyhz/shop/dto/IdentitycardDto.java
 	renamed:    main/java/com/flyhz/shop/dto/Order.java -> main/java/com/flyhz/shop/dto/OrderDto.java
 	renamed:    main/java/com/flyhz/shop/dto/Product.java -> main/java/com/flyhz/shop/dto/ProductDto.java
 	renamed:    main/java/com/flyhz/shop/dto/UserDetail.java -> main/java/com/flyhz/shop/dto/UserDetailDto.java
 	renamed:    main/java/com/flyhz/shop/dto/User.java -> main/java/com/flyhz/shop/dto/UserDto.java
 	renamed:    main/java/com/flyhz/shop/dto/Coupon.java -> main/java/com/flyhz/shop/dto/VoucherDto.java
 	new file:   main/java/com/flyhz/shop/persistence/dao/CartItemDao.java
 	renamed:    main/java/com/flyhz/shop/persistence/entity/Brand.java -> main/java/com/flyhz/shop/persistence/entity/BrandModel.java
 	renamed:    main/java/com/flyhz/shop/persistence/entity/Cartitem.java -> main/java/com/flyhz/shop/persistence/entity/CartitemModel.java
 	renamed:    main/java/com/flyhz/shop/persistence/entity/Category.java -> main/java/com/flyhz/shop/persistence/entity/CategoryModel.java
 	renamed:    main/java/com/flyhz/shop/persistence/entity/Consignee.java -> main/java/com/flyhz/shop/persistence/entity/ConsigneeModel.java
 	renamed:    main/java/com/flyhz/shop/persistence/entity/Coupon.java -> main/java/com/flyhz/shop/persistence/entity/CouponModel.java
 	renamed:    main/java/com/flyhz/shop/persistence/entity/Order.java -> main/java/com/flyhz/shop/persistence/entity/OrderModel.java
 	renamed:    main/java/com/flyhz/shop/persistence/entity/Product.java -> main/java/com/flyhz/shop/persistence/entity/ProductModel.java
 	renamed:    main/java/com/flyhz/shop/persistence/entity/Promotion.java -> main/java/com/flyhz/shop/persistence/entity/PromotionModel.java
 	renamed:    main/java/com/flyhz/shop/persistence/entity/User.java -> main/java/com/flyhz/shop/persistence/entity/UserModel.java
 	renamed:    main/java/com/flyhz/shop/persistence/entity/Voucher.java -> main/java/com/flyhz/shop/persistence/entity/VoucherModel.java
 	modified:   main/java/com/flyhz/shop/service/OrderService.java
 	modified:   main/java/com/flyhz/shop/service/PromotionService.java
 	modified:   main/java/com/flyhz/shop/service/ShoppingCartService.java
 	modified:   main/java/com/flyhz/shop/service/UserService.java
 	modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
 	modified:   main/java/com/flyhz/shop/service/impl/PromotionServiceImpl.java
 	modified:   main/java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java
 	modified:   main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
 	modified:   main/java/com/flyhz/shop/web/controller/LoginController.java
 	modified:   main/resources/mybatis/sqlMapConfig.xml
 	new file:   main/resources/mybatis/sqlmap/CartItemMapper.xml
 	modified:   main/resources/spring/applicationContext-dao.xml
 	modified:   ../../smile_nodejs/.idea/workspace.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

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

  It looks like you may be committing a merge.
  If this is not correct, please remove the file
 	.git/MERGE_HEAD
  and try again.

  Please enter the commit message for your changes. Lines starting
  with ' ' will be ignored, and an empty message aborts the commit.
  On branch master
  Your branch and 'origin/master' have diverged,
  and have 3 and 12 different commits each, respectively.
    (use "git pull" to merge the remote branch into yours)

  All conflicts fixed but you are still merging.

  Changes to be committed:
 	modified:   pom.xml
 	new file:   src/main/java/com/flyhz/framework/redis/CacheRepository.java
 	new file:   src/main/java/com/flyhz/framework/redis/impl/RCacheRepository.java
 	new file:   src/main/java/com/flyhz/framework/solr/Fraction.java
 	new file:   src/main/java/com/flyhz/framework/solr/PageModel.java
 	new file:   src/main/java/com/flyhz/framework/solr/ProductFraction.java
 	new file:   src/main/java/com/flyhz/framework/util/RegexUtils.java
 	new file:   src/main/java/com/flyhz/framework/util/UrlUtil.java
 	new file:   src/main/java/com/flyhz/shop/dto/ProductBuildDto.java
 	modified:   src/main/java/com/flyhz/shop/persistence/dao/CartItemDao.java
 	new file:   src/main/java/com/flyhz/shop/persistence/dao/ProductDao.java
 	new file:   src/main/java/com/flyhz/shop/persistence/dao/UserDao.java
 	modified:   src/main/java/com/flyhz/shop/persistence/entity/UserModel.java
 	new file:   src/main/java/com/flyhz/shop/service/BuildService.java
 	modified:   src/main/java/com/flyhz/shop/service/UserService.java
 	new file:   src/main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
 	modified:   src/main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
 	new file:   src/main/java/com/flyhz/shop/web/controller/BuildController.java
 	modified:   src/main/java/com/flyhz/shop/web/controller/IndexController.java
 	new file:   src/main/java/com/flyhz/shop/web/controller/UserController.java
 	modified:   src/main/resources/mybatis/sqlMapConfig.xml
 	new file:   src/main/resources/mybatis/sqlmap/ProductMapper.xml
 	new file:   src/main/resources/mybatis/sqlmap/UserMapper.xml
 	modified:   src/main/resources/spring/applicationContext-core.xml
 	modified:   src/main/resources/spring/applicationContext-dao.xml
 	modified:   src/main/resources/spring/applicationContext-service.xml
 	new file:   src/main/webapp/vm/screen/register2.vm
 	modified:   src/test/java/com/flyhz/shop/IStart.java
  Changes to be committed:
 	renamed:    main/java/com/flyhz/framework/redis/CacheRepository.java -> main/java/com/flyhz/framework/lang/CacheRepository.java
 	renamed:    main/java/com/flyhz/framework/solr/Fraction.java -> main/java/com/flyhz/shop/build/solr/Fraction.java
 	renamed:    main/java/com/flyhz/framework/solr/PageModel.java -> main/java/com/flyhz/shop/build/solr/PageModel.java
 	renamed:    main/java/com/flyhz/framework/solr/ProductFraction.java -> main/java/com/flyhz/shop/build/solr/ProductFraction.java
 	renamed:    main/java/com/flyhz/framework/redis/impl/RCacheRepository.java -> main/java/com/flyhz/shop/persistence/RCacheRepository.java
 	modified:   main/java/com/flyhz/shop/persistence/dao/ProductDao.java
 	modified:   main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz