Merge remote-tracking branch 'origin/mark' into don

2019-09-12 08:40:59 +08:00
parent ad2acc3a7e 84b4d400e4
commit 895ad8b4f6
9 changed files with 83 additions and 46 deletions
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -891,15 +891,6 @@ func init() {
            Filters: nil,
            Params: nil})

-    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
-        beego.ControllerComments{
-            Method: "GetStoreOrderCountInfo2",
-            Router: `/GetStoreOrderCountInfo2`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
        beego.ControllerComments{
            Method: "GetStoresOrderSaleInfo",