new file:   smile/src/main/java/com/flyhz/framework/util/MD5.java
	new file:   smile/src/main/java/com/flyhz/framework/util/RandomString.java
	modified:   smile/src/main/java/com/flyhz/shop/dto/User.java
	new file:   smile/src/main/java/com/flyhz/shop/persistence/dao/UserDao.java
	modified:   smile/src/main/java/com/flyhz/shop/persistence/entity/User.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

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

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

Conflicts:
	smile/src/main/java/com/flyhz/shop/persistence/dao/UserDao.java
	smile/src/main/java/com/flyhz/shop/persistence/entity/UserModel.java
	smile/src/main/java/com/flyhz/shop/service/impl/UserServiceImpl.java

	modified:   ../../pom.xml
	modified:   java/com/flyhz/shop/persistence/dao/CartItemDao.java
	modified:   java/com/flyhz/shop/persistence/dao/UserDao.java
	modified:   java/com/flyhz/shop/persistence/entity/UserModel.java
	modified:   java/com/flyhz/shop/service/UserService.java
	modified:   java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   java/com/flyhz/shop/web/controller/IndexController.java
	new file:   java/com/flyhz/shop/web/controller/UserController.java
	modified:   resources/mybatis/sqlMapConfig.xml
	new file:   resources/mybatis/sqlmap/UserMapper.xml
	modified:   resources/spring/applicationContext-dao.xml
	new file:   webapp/vm/screen/register2.vm
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz