modified:   main/java/com/flyhz/shop/persistence/entity/UserModel.java
	modified:   main/java/com/flyhz/shop/web/controller/LoginController.java
	modified:   main/resources/mybatis/sqlmap/UserMapper.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

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

	modified:   main/resources/mybatis/sqlmap/UserMapper.xml