Merge branch 'master' into develop

* master:
  add live awards function
  add live awards function

app/models/order_static.rb

@@ -40,9 +40,8 @@ class OrderStatic < ActiveRecord::Base
   STATUS_ENUM = [["处理中,已完成,待收货",""],["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
   
   rails_admin do
-    navigation_label '商品销售汇总'
+    navigation_label '统计汇总'
     weight -500
-    parent Order
     list do
       filters [:state,:is_send]
       field :id

app/models/order_static_detail.rb

@@ -16,9 +16,9 @@ class OrderStaticDetail < ActiveRecord::Base
     end
   end
   rails_admin do
-    navigation_label '销售汇总明细'
+    navigation_label '统计汇总'
     weight -500
-    parent Order
+    parent OrderStatic
     list do
       filters [:begin_date,:end_date, :state,:is_send]
       field :id

config/initializers/rails_admin.rb

@@ -100,8 +100,7 @@ RailsAdmin.config do |config|
     end
     export
     import do
-      only ["UpdateOrder"]
-      only ["LiveAward"]
+      only ["UpdateOrder","LiveAward"]
     end
     history_index do
       # PAPER_TRAIL_AUDIT_MODEL