From 289b0503bc197d196997142f60b3a8ef8b70f0cc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Jun 2021 22:00:44 +0800
Subject: [PATCH] conflect fix
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml
index ffb89a5..46254ee 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml
@@ -50,9 +50,7 @@
<!--规格信息-->
<association property="shopSku" column="s_id"
select="com.matrix.system.shopXcx.dao.ShopSkuDao.selectById"/>
- <!--查询生产企业-->
- <association property="productionEnterprise" column="{pId=p_id}"
- select="selectProductionEnterpriseByPid"/>
+
</resultMap>
--
Gitblit v1.9.1