From 12990a5138e3fa8874a601bfb784a2b1147f0f24 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 06 Apr 2021 11:53:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml | 7 +++++++
1 files changed, 7 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 716911e..4c51ce9 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
@@ -213,6 +213,13 @@
<if test="record.actName != null and record.actName != '' ">
act_name = #{record.actName},
</if>
+ <if test="record.actCode != null ">
+ act_code = #{record.actCode},
+ </if>
+
+ <if test="record.actContent != null ">
+ act_content = #{record.actContent},
+ </if>
<if test="record.actType != null ">
act_type = #{record.actType},
</if>
--
Gitblit v1.9.1