合并冲突

routers/commentsRouter.go

@@ -7,12 +7,6 @@ import (
 
 func init() {
 
-<<<<<<< HEAD
-    beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:PdfController"] = append(beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:PdfController"],
-        beego.ControllerComments{
-            Method: "GeneratePdf",
-            Router: `/generate_pdf`,
-=======
     beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:KplerController"] = append(beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:KplerController"],
         beego.ControllerComments{
             Method: "GetFlowData",
@@ -35,7 +29,15 @@ func init() {
         beego.ControllerComments{
             Method: "GetZoneData",
             Router: `/getZoneData`,
->>>>>>> master
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:PdfController"] = append(beego.GlobalControllerRouter["eta/eta_data_analysis/controllers:PdfController"],
+        beego.ControllerComments{
+            Method: "GeneratePdf",
+            Router: `/generate_pdf`,
             AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,