From 06c0b03df2955475fe39ff2a793a5f151f4da99f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 17 八月 2023 19:25:30 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
service/masterOrder.go | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/service/masterOrder.go b/service/masterOrder.go
index 6ce2a5f..1c36a33 100644
--- a/service/masterOrder.go
+++ b/service/masterOrder.go
@@ -44,9 +44,9 @@
return ecode.OK
}
-func (MasterOrderService) GetMasterOrderList(page, pageSize int, keyword string) ([]*model.MasterOrder, int64, int) {
+func (MasterOrderService) GetMasterOrderList(page, pageSize int, data map[string]interface{}) ([]*model.MasterOrder, int64, int) {
// get contact list
- contacts, total, err := model.NewMasterOrderSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewMasterOrderSearch().SetPage(page, pageSize).SetSearchMap(data).FindAll()
if err != nil {
return nil, 0, ecode.MasterOrderListErr
}
--
Gitblit v1.8.0