From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..b3835b5 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -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