From d524c2c3f60032916218a638ee5fa610cd2a330c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 09 Jun 2022 17:02:37 +0800
Subject: [PATCH] Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
index 30fa7f3..e7c85c5 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -3,7 +3,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.matrix.system.hive.dao.ShoppingGoodsDao">
- <cache readOnly="true"></cache>
+
<resultMap type="ShoppingGoods" id="ShoppingGoodsMap">
<id property="id" column="id" />
@@ -308,8 +308,8 @@
invalid_time,
pay_methods,
is_infinite,
- achieve_rule_id
-
+ achieve_rule_id,
+ is_cooperate
)
VALUES (
#{id},
@@ -371,8 +371,8 @@
#{invalidTime},
#{payMethods},
#{isInfinite},
- #{achieveRuleId}
-
+ #{achieveRuleId},
+ #{isCooperate}
)
</insert>
@@ -897,7 +897,7 @@
t.id=cate_id)
cate_name
from shopping_goods a
- where code=#{code}
+ where a.code=#{code} and a.is_del=1
</select>
<!-- 根据id查询 -->
--
Gitblit v1.9.1