Merge remote-tracking branch 'origin/dev' into feature-weixinLogin-wangmh

# Conflicts:
#	sso-server/src/main/java/com/uas/sso/controller/UpdateUserController.java

sso-server/src/main/java/com/uas/sso/controller/UpdateUserController.java

@@ -152,7 +152,6 @@ public class UpdateUserController extends BaseController {
                 return error("参数错误");
         }
 
-
         // 发送邮件
         if (!StringUtils.isEmpty(email)) {
             Setting mailTplId = settingService.findOne("templateForSendMailWhenResetPassword");