Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/live_links_controller.rb

@@ -9,7 +9,7 @@ class LiveLinksController < ApplicationController
     order_str = "on_status desc,id desc"
     @total_count = lives.size
     @my_live_id = @course.live_links.find_by(user_id: current_user.id)&.id
-    order_str = "#{@my_live_id} desc, #{order_str}" if @my_live_id.present?
+    order_str = "live_links.id = #{@my_live_id} desc, #{order_str}" if @my_live_id.present?
     lives = lives.order("#{order_str}")
     @lives = paginate lives.includes(user: :user_extension)
   end