Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/models/examination_intelligent_setting.rb

@@ -3,5 +3,5 @@ class ExaminationIntelligentSetting < ApplicationRecord
   belongs_to :user
   has_many :examination_type_settings, dependent: :destroy
   has_many :tag_discipline_containers, as: :container, dependent: :destroy
-  has_many :item_baskets, dependent: :destroy
+  has_many :item_baskets,  -> { order("item_baskets.position ASC") }, dependent: :destroy
 end