From ad3f115b29e3c33b32bd38855bdc5b9f2de381b1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 18:31:56 +0800
Subject: [PATCH] Merge branch 'ty_fix' into alpha

---
 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 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..42b4adc 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>
 

--
Gitblit v1.9.1