From 09236e832a65ab4f99e4ca6ecb3ab6022c86ea37 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Mon, 08 Mar 2021 12:08:06 +0800 Subject: [PATCH] Merge branch 'api' into hive2.0 --- zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductAttributeDao.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductAttributeDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductAttributeDao.xml index 1efb9b7..f025c09 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductAttributeDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductAttributeDao.xml @@ -39,7 +39,7 @@ <result property="attrMark" column="attr_mark" /> <result property="sort" column="sort"/> <result property="companyId" column="company_id" /> - <collection property="child" column="{attrId=attr_id, shopId=shop_id}" select="selectByParentIds"/> + <collection property="child" column="{attrId=attr_id, companyId=company_id}" select="selectByParentIds"/> </resultMap> <!-- 根据id查询--> @@ -47,7 +47,7 @@ select <include refid="columns" ></include> from shop_product_attribute - where parent_id=#{attrId} and shop_id=#{shopId} + where parent_id=#{attrId} and company_id=#{companyId} </select> <!-- 根据编码查询--> -- Gitblit v1.9.1