Merge branch 'develop'

* develop:
  single order purch_limit
  single order purch_limit

app/models/product.rb

@@ -180,6 +180,7 @@ class Product < ActiveRecord::Base
             field :show_flag
             field :live
             field :sale_nums
+            field :single_purch_limit
             field :created_at
             field :updated_at
         end
@@ -240,6 +241,7 @@ class Product < ActiveRecord::Base
             field :relate_product_id
             field :show_flag
             field :live
+            field :single_purch_limit
             field :created_at
             field :updated_at
         end
@@ -296,6 +298,7 @@ class Product < ActiveRecord::Base
             field :relate_product_id
             field :show_flag
             field :live
+            field :single_purch_limit
         end
 
     end

config/locales/models/product.yml

@@ -52,4 +52,5 @@ zh-CN:
         color_name: 规格二
         relate_product_id: 关联主商品
         show_flag: 主商品标记
-        live: 是否直播
+        live: 是否直播
+        single_purch_limit: 单次限购量