Merge branch 'dev' into test

@@ -20,23 +20,23 @@
 		parameterType="java.lang.Integer">
 		select
 		<include refid="Base_Column_List" />
-		from dingdang_log
+		from union_active_record
 		where id = #{id,jdbcType=INTEGER}
 	</select>
 	<select id="selectByUdidAndApp" resultMap="BaseResultMap"
 		parameterType="com.yoho.union.dal.model.DingdangLog">
 		select
 		<include refid="Base_Column_List" />
-		from dingdang_log
+		from union_active_record
 		where udid=#{udid} and app=#{app} limit 1
 	</select>
 	<insert id="insert" parameterType="com.yoho.union.dal.model.DingdangLog">
-		insert into dingdang_log (union_name, app,udid, callbackurl, create_time, update_time, type)
+		insert into union_active_record (union_name, app,udid, callbackurl, create_time, update_time, type)
 		values (#{unionName,jdbcType=VARCHAR},#{app,jdbcType=VARCHAR},#{udid,jdbcType=VARCHAR}, #{callbackurl,jdbcType=VARCHAR}, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), #{type})
 	</insert>
 	
 	<update id="updateByPrimaryKey" parameterType="com.yoho.union.dal.model.DingdangLog">
-		update dingdang_log
+		update union_active_record
 		set is_active = #{isActive,jdbcType=CHAR}, update_time = UNIX_TIMESTAMP()
 		where id = #{id,jdbcType=INTEGER}
 	</update>