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

# Conflicts:
#	controllers/config.go

controllers/config.go

@@ -123,7 +123,3 @@ func (this *ConfigController) DescriptionOfResearch() {
 	br.Success = true
 	br.Data = resp
 }
-
-type ChartPermissionRepMore struct {
-	PermissionName string `description:"名称"`
-}

controllers/resource.go

@@ -95,6 +95,10 @@ func (this *ResourceController) Upload() {
 	return
 }
 
+type ChartPermissionRepMore struct {
+	PermissionName string `description:"名称"`
+}
+
 func init() {
 	var list []*ChartPermissionRepMore
 	Lista := []*ChartPermissionRepMore{{PermissionName: "A"}, {PermissionName: "A"}, {PermissionName: "A"}, {PermissionName: "A"}}