From c5f009b990f649fdbcd004305d49736fd41f3a22 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 13 Apr 2021 19:22:19 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp 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