Merge branch 'develop'

* develop:
  add promotion products

app/models/ability.rb

@@ -29,7 +29,7 @@ class Ability
         # can :update, :all
       else
         user.permissions.each do |permission|
-          if permission.model=="Order"
+          if permission.model=="Order111"
             D_ENUM.clear
               departs = DepartRecord.find_by_sql("select id from depart_records ")
               departs.each do |dep|