Merge branch 'develop' into standalone_develop

app/services/api/v1/users/update_email_service.rb

@@ -20,6 +20,8 @@ class Api::V1::Users::UpdateEmailService < ApplicationService
   def call 
     raise Error, errors.full_messages.join(",") unless valid? 
     raise Error, "密码不正确." unless @user.check_password?(@password)
+    exist_owner = Owner.find_by(mail: @mail)
+    raise Error, "邮箱已被使用." if exist_owner 
     is_debug =  @code == "123123" && EduSetting.get("code_debug") # 万能验证码，用于测试 # TODO 万能验证码，用于测试
     raise Error, "验证码不正确." if @verify_code&.code != @code && !is_debug
     raise Error, "验证码已失效." if !@verify_code&.effective? && !is_debug