Merge branch 'cygx_5.3' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/config.go

@@ -127,16 +127,3 @@ func (this *ConfigController) DescriptionOfResearch() {
 type ChartPermissionRepMore struct {
 	PermissionName string `description:"名称"`
 }
-
-func init() {
-	var list []*ChartPermissionRepMore
-	Lista := []*ChartPermissionRepMore{{PermissionName: "A"}, {PermissionName: "A"}, {PermissionName: "A"}, {PermissionName: "A"}}
-	Listb := []*ChartPermissionRepMore{{PermissionName: "B"}, {PermissionName: "B"}, {PermissionName: "B"}, {PermissionName: "B"}}
-
-	for _, v := range Lista {
-		list = append(list, v)
-	}
-	fmt.Println("来了呀")
-	fmt.Println(Listb)
-	fmt.Println(list)
-}

controllers/resource.go

@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/services"
 	"hongze/hongze_cygx/utils"
@@ -93,3 +94,16 @@ func (this *ResourceController) Upload() {
 	br.Data = resp
 	return
 }
+
+func init() {
+	var list []*ChartPermissionRepMore
+	Lista := []*ChartPermissionRepMore{{PermissionName: "A"}, {PermissionName: "A"}, {PermissionName: "A"}, {PermissionName: "A"}}
+	Listb := []*ChartPermissionRepMore{{PermissionName: "B"}, {PermissionName: "B"}, {PermissionName: "B"}, {PermissionName: "B"}}
+
+	for _, v := range Lista {
+		list = append(list, v)
+	}
+	fmt.Println("来了呀")
+	fmt.Println(Listb)
+	fmt.Println(list)
+}