From 114e9de3523572e212890360979e682de8a8c1e5 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Fri, 25 Oct 2024 15:55:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/svc/svc_data_center_generate_data.go | 2 +-
 go.mod                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/svc/svc_data_center_generate_data.go b/app/svc/svc_data_center_generate_data.go
index d1d616f..a07210b 100644
--- a/app/svc/svc_data_center_generate_data.go
+++ b/app/svc/svc_data_center_generate_data.go
@@ -70,7 +70,7 @@ func DataCenterIncomeDataListOutput(c *gin.Context, req md.DataCenterGenerateDat
 	mediumId := GetMediumIdStr(c, user.AdmId, "", "")
 	slotId := GetSlotId(c, req.State)
 	req.Limit = "3000"
-	MediumList, _, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataListMedium(c.GetString("mid"), appId, mediumId, slotId, req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit))
+	MediumList, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataListMediumAll(c.GetString("mid"), appId, mediumId, slotId, req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit))
 	data := map[string]string{
 		"A1": "名称",
 		"B1": "日期",
diff --git a/go.mod b/go.mod
index a0d6e8e..1dc1fee 100644
--- a/go.mod
+++ b/go.mod
@@ -36,7 +36,7 @@ require (
 require (
 	code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5
 	code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git v1.1.21-0.20240830072333-a1980ffb256e
-	code.fnuoos.com/zhimeng/model.git v0.0.3-0.20241025040814-725e7331c9a8
+	code.fnuoos.com/zhimeng/model.git v0.0.3-0.20241025075329-56b007c1b548
 	github.com/360EntSecGroup-Skylar/excelize v1.4.1
 	github.com/jinzhu/copier v0.4.0
 )