Accept Merge Request #98: (dev-xwt -> dev-test)

Merge Request: 配送站点

Created By: @夏文涛
Accepted By: @夏文涛
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/98?initial=true

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

@@ -92,6 +92,7 @@
         tiu.user_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,
         ti.rider_user_id as riderUserId, tcu.money as couponMoney,
         apr.discount_amount as activityDiscountAmount, ai.title activityTitle,tiu.rider_station_id as riderStationId,
+        (select station_name from rider_station where id = tiu.rider_station_id ) as stationName,
         (select st.shop_type_name from shop_type st where st.id =gs.shop_type_id ) as shopTypeName,
         (case when tcu.shop_id =0 then '平台' else gs2.shop_name end) as couponTypeRemark,
         pd.trade_no as transactionId