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

app/controllers/gits_controller.rb

@@ -54,6 +54,7 @@ class GitsController < ApplicationController
             uid_logger("git start auth: systemuser is #{system_user.try(:login)}")
 
             if shixun.present?
+              logger.info("#######{system_user.manager_of_shixun?(shixun)}")
               if system_user.present? && system_user.manager_of_shixun?(shixun)
                 result = true
               else

app/models/user.rb

@@ -331,6 +331,7 @@ class User < ApplicationRecord
 
   # 实训管理员：实训合作者、admin
   def manager_of_shixun?(shixun)
+    logger.info("############id: #{id}")
      shixun.shixun_members.exists?(role: [1,2], user_id: id) || admin? || business?
   end