Merge branch 'zhaoyue-dev' into 'master'

Add login and mod pwd



See merge request !15

@@ -85,7 +85,7 @@ public class AdminAccountController {
 
     @AntiXSS
     @RequestMapping(method = RequestMethod.PUT)
-    @ApiOperation(value = "USPIH Login and modify password", notes = "loginmodpwd")
+    @ApiOperation(value = "USPIH Login and modify password")
     public ResponseEntity<ResultModel> loginModPwd(@RequestParam String account, @RequestParam String password, @RequestParam String newpwd) {
         Assert.notNull(account, "account can not be empty");
         Assert.notNull(password, "password can not be empty");