modified:   main/java/com/flyhz/shop/web/controller/UserController.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz