From 8c383fda066ba6166ec3bf622d44d8b17bfac71f Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Tue, 13 Apr 2021 15:27:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml index b044a72..d2cd718 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml +++ b/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 -- Gitblit v1.9.1