From b5d1101e78a221cdf2ac14063cb954e594de817b Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 2 Apr 2019 09:50:47 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E8=BF=94=E5=9B=9Eprinter=5Fsn=E5=92=8Cprin?= =?UTF-8?q?ter=5Fkey=E5=9C=A8GetStores=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 6eaa0c85b..ebdaf4081 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -88,6 +88,8 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa t1.id_card_hand, t1.licence, t1.licence_code, + t1.printer_sn, + t1.printer_key, city.name city_name, district.name district_name, CONCAT("[", GROUP_CONCAT(DISTINCT CONCAT('{"vendorStoreID":"', m1.vendor_store_id, '", "vendorID":', m1.vendor_id, ', "status":', m1.status, ', "pricePercentage":', m1.price_percentage, '}')), ']') store_map_str, @@ -215,7 +217,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa } sql += sqlWhere + ` - GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28 + GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 ORDER BY t1.id DESC LIMIT ? OFFSET ?` pageSize = jxutils.FormalizePageSize(pageSize)