Merge branch 'develop' into dev_trustie_server

This commit is contained in:
jasder
2021-04-27 18:24:41 +08:00
33 changed files with 2427 additions and 9 deletions

View File

@@ -148,9 +148,11 @@ class User < Owner
has_many :trail_auth_apply_actions, -> { where(container_type: 'TrialAuthorization') }, class_name: 'ApplyAction'
# has_many :attendances
has_many :applied_messages, dependent: :destroy
has_many :operate_applied_messages, class_name: 'AppliedMessage', dependent: :destroy
# 项目
has_many :applied_projects, dependent: :destroy
has_many :operate_applied_transfer_projects, class_name: 'AppliedTransferProject', dependent: :destroy
# 教学案例
# has_many :libraries, dependent: :destroy