From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
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