Merge remote-tracking branch 'origin/0727RecommendActive' into 0727RecommendActive

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/kylinRecommendActiveMapper.xml

@@ -17,7 +17,7 @@
     <select id="validateTime" parameterType="com.liquidnet.service.kylin.entity.KylinRecommendActive" resultType="int">
     select count(1) from  kylin_recommend_active
     where (#{startTime} BETWEEN start_time and end_time
-    or #{endTime} BETWEEN start_time and end_time) and active_type=#{activeType} and active_bind_id=#{activeBindId} and mid != #{mid}
+    or #{endTime} BETWEEN start_time and end_time) and active_type=#{activeType} and active_bind_id=#{activeBindId} and recommend_id != #{recommendId}
     </select>
 
     <select id="getBybindId"  resultMap="BaseResultMap">