Merge branch 'bzq/dev' of eta_mini/eta_mini_api into debug

controllers/user.go

@@ -579,12 +579,9 @@ func (this *UserAuthController) PermissionList() {
 			}
 		}
 	}
-	if len(privateView) == 0 {
-		br.Data = publicView
-	} else {
-		br.Data = privateView
-	}
 
+	publicView = append(publicView, privateView...)
+	br.Data = publicView
 	br.Msg = "查询成功"
 	br.Success = true
 	br.Ret = 200