Merge branch 'master' into jxstore

2018-09-17 11:10:20 +08:00
parent a42f450368 d8e585e86d
commit d7b4df6e97
1 changed files with 5 additions and 2 deletions
--- a/globals/beegodb/beegodb.go
+++ b/globals/beegodb/beegodb.go
@@ -22,8 +22,11 @@ func Init() {
 	orm.RegisterModel(new(legacymodel.Jxstorefeature))

 	orm.RegisterModel(new(legacymodel.TempLog))
-	orm.RegisterModel(new(legacymodel.Jxorder2))
-	orm.RegisterModel(new(legacymodel.Jxordersku2))
+
+	if globals.GenerateLegacyJxOrder {
+		orm.RegisterModel(new(legacymodel.Jxorder2))
+		orm.RegisterModel(new(legacymodel.Jxordersku2))
+	}

 	if globals.EnableStore {
 		orm.RegisterModel(&model.Place{})