From c5777f60191a5be549cd69a45bfc32e3e772d9cc Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 21 Dec 2018 13:54:09 +0800 Subject: [PATCH] - return remark in GetStoreOpRequests --- business/jxstore/cms/store_sku.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 125015b54..274bfbfcd 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1004,7 +1004,7 @@ func GetStoreOpRequests(ctx *jxcontext.Context, fromTime, toTime time.Time, keyw sql := ` SELECT SQL_CALC_FOUND_ROWS t1.id, t1.created_at, t1.updated_at, t1.last_operator, t1.deleted_at, - t1.type, t1.store_id, t1.item_id, t1.status, t1.user_id, t1.int_param1, t1.int_param2, + t1.type, t1.store_id, t1.item_id, t1.status, t1.user_id, t1.int_param1, t1.int_param2, t1.remark t2.name store_name, t3.prefix sku_name_prefix, t3.name sku_name_name, MAX(t5.unit_price) unit_price FROM store_op_request t1 JOIN store t2 ON t1.store_id = t2.id @@ -1051,7 +1051,7 @@ func GetStoreOpRequests(ctx *jxcontext.Context, fromTime, toTime time.Time, keyw } sql += ` - GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 + GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 LIMIT ? OFFSET ?` pageSize = jxutils.FormalizePageSize(pageSize) sqlOffset := offset