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
---
api/v1/subOrder.go | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/api/v1/subOrder.go b/api/v1/subOrder.go
index d749e21..8d804fe 100644
--- a/api/v1/subOrder.go
+++ b/api/v1/subOrder.go
@@ -98,7 +98,6 @@
ctx.Ok()
}
-
// checkSubOrderParams
// 妫�鏌ュ瓙璁㈠崟鍙傛暟
func checkSubOrderParams(subOrder request.SubOrder) (errCode int, newSubOrder model.SubOrder) {
@@ -134,14 +133,14 @@
return
}
- subOrders, total, errCode := subOrderService.GetSubOrderList(params.Page, params.PageSize, params.Keyword)
+ subOrders, total, errCode := subOrderService.GetSubOrderList(params.Page, params.PageSize, params.SearchMap)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
}
ctx.OkWithDetailed(response.SubOrderResponse{
- List: subOrders,
+ List: subOrders,
Count: int(total),
})
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0