Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -190,6 +190,9 @@ public class AppUserController extends CommonBaseController{
         String id = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
         userVo.setUserid(Integer.valueOf(id));
         userDetailBiz.updUuserInfoById(userVo);
+        if (StringUtils.isNotBlank(userVo.getPassword())) {
+            appUserLoginBiz.updatePasswordById(new AppUserLogin(){{setId(Integer.parseInt(id)); setPassword(userVo.getPassword());}});
+        }
         return ObjectRestResponse.succ();
     }