modified:   main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   main/webapp/vm/screen/register.vm
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   main/java/com/flyhz/framework/util/JSONUtil.java
	new file:   main/java/com/flyhz/shop/persistence/dao/OrderDao.java
	modified:   main/java/com/flyhz/shop/persistence/entity/OrderModel.java
	modified:   main/java/com/flyhz/shop/service/OrderService.java
	modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   main/webapp/vm/screen/register.vm
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   main/java/com/flyhz/shop/persistence/entity/OrderModel.java
	modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   main/resources/mybatis/sqlMapConfig.xml
	modified:   main/resources/spring/applicationContext-dao.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile/src/main/java/com/flyhz/shop/persistence/entity/OrderModel.java

	modified:   main/java/com/flyhz/shop/persistence/dao/CartItemDao.java
	modified:   main/java/com/flyhz/shop/persistence/entity/BrandModel.java
	modified:   main/java/com/flyhz/shop/persistence/entity/CartitemModel.java
	modified:   main/java/com/flyhz/shop/persistence/entity/CategoryModel.java
	modified:   main/java/com/flyhz/shop/persistence/entity/ConsigneeModel.java
	modified:   main/java/com/flyhz/shop/persistence/entity/CouponModel.java
	modified:   main/java/com/flyhz/shop/persistence/entity/OrderModel.java
	modified:   main/java/com/flyhz/shop/persistence/entity/ProductModel.java
	modified:   main/java/com/flyhz/shop/persistence/entity/PromotionModel.java
	modified:   main/java/com/flyhz/shop/persistence/entity/UserModel.java
	modified:   main/java/com/flyhz/shop/persistence/entity/VoucherModel.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/ShoopingCartServiceImpl.java
	modified:   main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   main/resources/mybatis/sqlMapConfig.xml
	modified:   main/resources/mybatis/sqlmap/CartItemMapper.xml
	new file:   main/resources/mybatis/sqlmap/ConsigneeMapper.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz