From abe25c659140b8c3f4db90ce943f4143a7d7f40f Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 06 Apr 2021 11:25:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
index d6f7f20..716911e 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
@@ -67,6 +67,7 @@
 		update_time,
 			id,
 			act_name,
+			act_code,
 			act_type,
 			act_begin_time,
 			act_end_time,
@@ -87,6 +88,7 @@
 		now(),
 			#{item.id},
 			#{item.actName},
+			#{item.actCode},
 			#{item.actType},
 			#{item.actBeginTime},
 			#{item.actEndTime},

--
Gitblit v1.9.1