Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-13 8c383fda066ba6166ec3bf622d44d8b17bfac71f

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml

@@ -623,7 +623,7 @@
      o.wx_order_no,
      o.pay_result,
      o.postage,
             o.pay_method
             o.pay_method,
      s.shop_name,
      o.order_type
      from shop_order o