Browse Source

Merge branch 'chart/12.4'

# Conflicts:
#	routers/router.go
Roc 2 years ago
parent
commit
caa546066e
1 changed files with 8 additions and 2 deletions
  1. 8 2
      routers/router.go

+ 8 - 2
routers/router.go

@@ -8,6 +8,7 @@
 package routers
 
 import (
+	beego "github.com/beego/beego/v2/server/web"
 	"hongze/hongze_edb_lib/controllers"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -130,9 +131,9 @@ func init() {
 				&controllers.PredictController{},
 			),
 		),
-		beego.NSNamespace("/com_trade",
+		beego.NSNamespace("/future_good",
 			beego.NSInclude(
-				&controllers.ComTradeController{},
+				&future_good.FutureGoodEdbInfoController{},
 			),
 		),
 		beego.NSNamespace("/sci",
@@ -140,6 +141,11 @@ func init() {
 				&controllers.SciController{},
 			),
 		),
+		beego.NSNamespace("/com_trade",
+			beego.NSInclude(
+				&controllers.ComTradeController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }