Merge branch 'develop' into standalone_develop

2026-05-03 11:50:49 +08:00 · 2022-11-11 12:25:46 +08:00
parent 4a7dcf8a91 b56930b9ab
commit 84bfdf749f
3 changed files with 5 additions and 1 deletions
--- a/app/models/feedback_message_history.rb
+++ b/app/models/feedback_message_history.rb
@@ -29,6 +29,8 @@ class FeedbackMessageHistory < ApplicationRecord
    unless UserMailer.feedback_email(feedback&.user&.mail, title, content).deliver_now
      errors[:title] << '邮件发送失败！'
    end
+  rescue
+    errors[:title] << '邮件发送失败！'
  end

 end