解决冲突

app/controllers/concerns/laboratory_helper.rb

@@ -26,6 +26,7 @@ module LaboratoryHelper
   end
 
   def default_yun_session
-    @_default_yun_session = "#{current_laboratory.split('.').first}_user_id"
+    @_default_yun_session = "#{request.subdomain.split('.').first}_user_id"
+    # @_default_yun_session = "#{current_laboratory.try(:identifier).split('.').first}_user_id"
   end
 end