new file:   main/java/com/flyhz/framework/util/ValidateUtil.java
	modified:   main/java/com/flyhz/shop/persistence/dao/UserDao.java
	modified:   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/service/impl/UserServiceImpl.java

	new file:   main/java/com/flyhz/shop/persistence/dao/ConsigneeDao.java
	modified:   main/java/com/flyhz/shop/service/UserService.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
	modified:   main/resources/spring/applicationContext-dao.xml
	modified:   main/java/com/flyhz/shop/service/impl/UserServiceImpl.java