merge from develop

This commit is contained in:
2022-11-09 14:42:40 +08:00
2 changed files with 2 additions and 1 deletions

View File

@@ -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|