Merge branch 'cygx_12.0' into debug

controllers/yanxuan_special.go

@@ -66,7 +66,7 @@ func (this *YanxuanSpecialController) List() {
 	}
 	resp.List = list
 
-	br.Data = list
+	br.Data = resp
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"