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
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   main/java/com/flyhz/shop/persistence/dao/ConsigneeDao.java
	modified:   main/java/com/flyhz/shop/persistence/dao/OrderDao.java
	modified:   main/java/com/flyhz/shop/persistence/dao/UserDao.java
	modified:   main/java/com/flyhz/shop/persistence/entity/OrderModel.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/UserServiceImpl.java
	modified:   main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   main/resources/mybatis/sqlMapConfig.xml
	modified:   main/resources/mybatis/sqlmap/ConsigneeMapper.xml
	new file:   main/resources/mybatis/sqlmap/OrderMapper.xml
	modified:   main/resources/mybatis/sqlmap/UserMapper.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile/src/main/resources/mybatis/sqlmap/ConsigneeMapper.xml

	modified:   main/java/com/flyhz/framework/util/Constants.java
	modified:   main/java/com/flyhz/framework/util/UrlUtil.java
	modified:   main/java/com/flyhz/framework/util/ValidateUtil.java
	modified:   main/java/com/flyhz/shop/persistence/dao/CartItemDao.java
	modified:   main/java/com/flyhz/shop/persistence/dao/ConsigneeDao.java
	modified:   main/java/com/flyhz/shop/service/BuildService.java
	modified:   main/java/com/flyhz/shop/service/UserService.java
	modified:   main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
	modified:   main/java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java
	modified:   main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	new file:   main/java/com/flyhz/shop/web/controller/ConsigneeController.java
	modified:   main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   main/resources/mybatis/sqlmap/ConsigneeMapper.xml