modified:   main/java/com/flyhz/framework/lang/content/FinderJsonView.java
	modified:   main/java/com/flyhz/shop/web/controller/LoginController.java
	modified:   main/resources/mybatis/sqlMapConfig.xml
	modified:   main/resources/mybatis/sqlmap/UserMapper.xml
	modified:   main/resources/spring/applicationContext-service.xml
 +
Merge branch 'master' of https://github.com/rememberlostcode/flyhz