fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -1,5 +1,5 @@
 class BaseOrigamiController < ActionController::Base
-  include LoginVerification
+  include LoginVerification, MultiTenancy
  layout "origami"

  before_action :check_user