Merge branch 'master' into get-store

globals/beegodb/beegodb.go

@@ -47,6 +47,8 @@ func Init() {
 
 	// 如下语句建表时要出错（INDEX名字太长了），暂时放一下，必须放最后一句
 	orm.RegisterModel(&model.OrderFinancial{}, &model.AfsOrder{}, &model.OrderDiscountFinancial{}, &model.OrderSkuFinancial{})
+	// orm.RegisterModel(&model.Act{}, &model.ActOrderRule{}, &model.ActStoreSku{})
+	// orm.RegisterModel(&model.ActMap{}, &model.ActStoreMap{}, &model.ActStoreSkuMap{})
 	// create table
 	orm.RunSyncdb("default", false, true)
 }