Merge branch 'dev-增加商铺分类' of https://e.coding.net/chuanghaikeji/moxuanyunshangwaimai/backend into dev-测试环境分支不要从这拉代码

src/main/resources/mapper/order/OrderMapper.xml

@@ -179,6 +179,7 @@
         left join activity ai on ai.id = apr.activity_id
         left join (  select @a:=0,order_id ,group_concat(@a:=@a+1,".商品名：",goods_name,",数量：",goods_num,",规格：",sku_message) detail,sum(goods_num*goods_price) sumPrice  from order_goods og group by order_id
         ) ogg on ogg.order_id =tor.order_id
+        left join goods_shop gs2 on gs2.shop_id=tcu.shop_id
         where 1 = 1
         <if test="query.riderPhone!=null and query.riderPhone!=''">
             and tiu.phone =#{query.riderPhone}