Merge branch 'CRM12.0' into debug

controllers/english_report.go

@@ -15,7 +15,7 @@ type EnglishReportShareController struct {
 // @Param   ReportCode   query   string  true       "报告唯一编码"
 // @Success 200 {object} models.ReportShareDetailResp
 // @router /share/detail [get]
-func (this *ReportShareController) EnglishReportDetail() {
+func (this *EnglishReportShareController) EnglishReportDetail() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br

routers/commentsRouter.go

@@ -43,6 +43,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_api/controllers:EnglishReportShareController"] = append(beego.GlobalControllerRouter["hongze/hongze_api/controllers:EnglishReportShareController"],
+        beego.ControllerComments{
+            Method: "EnglishReportDetail",
+            Router: `/share/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_api/controllers:HomeCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_api/controllers:HomeCommonController"],
         beego.ControllerComments{
             Method: "PcListBanner",
@@ -160,15 +169,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_api/controllers:ReportShareController"] = append(beego.GlobalControllerRouter["hongze/hongze_api/controllers:ReportShareController"],
-        beego.ControllerComments{
-            Method: "EnglishReportDetail",
-            Router: `/share/detail`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_api/controllers:ReportShareController"] = append(beego.GlobalControllerRouter["hongze/hongze_api/controllers:ReportShareController"],
         beego.ControllerComments{
             Method: "Detail",

routers/commentsRouter_controllers.go

@@ -43,6 +43,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_api/controllers:EnglishReportShareController"] = append(beego.GlobalControllerRouter["hongze/hongze_api/controllers:EnglishReportShareController"],
+        beego.ControllerComments{
+            Method: "EnglishReportDetail",
+            Router: "/share/detail",
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_api/controllers:HomeCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_api/controllers:HomeCommonController"],
         beego.ControllerComments{
             Method: "PcListBanner",