From ea865027c9e115057644f59747f3bed2a8a963e6 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 23 May 2022 15:15:28 +0800
Subject: [PATCH] Merge branch 'master' into feature/订单服务单代码改造

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
index f3fa230..9d27ee7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
@@ -541,6 +541,7 @@
                a.card_Pay cardPay,
                a.PRICE price,
                a.ZK_PRICE zkPrice,
+               a.type type,
                a.status status
         from sys_order_item a
         inner join shopping_goods b on a.goods_id=b.id

--
Gitblit v1.9.1