From ecd79743e645671b7a6fcccb13348756de525e13 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 13 十月 2023 15:28:05 +0800
Subject: [PATCH] 合并代码
---
main.go | 1 -
service/salesReturn.go | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/main.go b/main.go
index 2b73602..462350f 100644
--- a/main.go
+++ b/main.go
@@ -8,7 +8,6 @@
"aps_crm/model"
"aps_crm/pkg/logx"
"aps_crm/router"
- "aps_crm/service"
"fmt"
"net/http"
"os"
diff --git a/service/salesReturn.go b/service/salesReturn.go
index 41b94fe..0592ca2 100644
--- a/service/salesReturn.go
+++ b/service/salesReturn.go
@@ -124,7 +124,7 @@
return ecode.OK
}
-func (SalesReturnService) GetSalesReturnList(params request.GetSalesReturnList, memberIds []int)) ([]*model.SalesReturn, int64, int) {
+func (SalesReturnService) GetSalesReturnList(params request.GetSalesReturnList, memberIds []int) ([]*model.SalesReturn, int64, int) {
// get contact list
contacts, total, err := model.NewSalesReturnSearch().
SetKeywordType(params.KeywordType).
--
Gitblit v1.8.0