From 8b505f74e1094fd67f86373ab9e9f80b54bca54e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 11 十月 2019 12:12:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceActiveMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceActiveMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceActiveMapper.xml
index 02e2a26..f6fbcaa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceActiveMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceActiveMapper.xml
@@ -97,10 +97,10 @@
<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
<if test="ipInfo != null">#{ipInfo,jdbcType=VARCHAR},</if>
- <if test="channel != null">#{channel,jdbcType=VARCHAR}</if>
- <if test="imei != null">#{imei,jdbcType=VARCHAR}</if>
- <if test="idfa != null">#{idfa,jdbcType=VARCHAR}</if>
- <if test="mac != null">#{mac,jdbcType=VARCHAR}</if>
+ <if test="channel != null">#{channel,jdbcType=VARCHAR},</if>
+ <if test="imei != null">#{imei,jdbcType=VARCHAR},</if>
+ <if test="idfa != null">#{idfa,jdbcType=VARCHAR},</if>
+ <if test="mac != null">#{mac,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.push.DeviceActive">update
--
Gitblit v1.8.0