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

2019-09-11 17:38:54 +08:00
parent 8a955013d9 30a7c1dbe2
commit 8378b832a3
40 changed files with 754 additions and 289 deletions
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -1791,6 +1791,15 @@ func init() {
            Filters: nil,
            Params: nil})

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