merge from develop

app/models/feedback_message_history.rb

@@ -26,7 +26,7 @@ class FeedbackMessageHistory < ApplicationRecord
   private 
 
   def send_meessage_email
-    unless UserMailer.update_email(mail, verification_code).deliver_now
+    unless UserMailer.feedback_email(user&.mail, title, content).deliver_now
       errors[:title] << '邮件发送失败！'
     end
   end

app/models/user.rb

@@ -177,6 +177,7 @@ class User < Owner
   has_one :trace_user, dependent: :destroy
   has_many :user_trace_tasks, dependent: :destroy 
   
+  has_many :feedbacks, dependent: :destroy
   # Groups and active users
   scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
   scope :like, lambda { |keywords|