Merge branch 'online1'

mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -204,7 +204,7 @@
 			vip_group_activity
 		WHERE
 			FIND_IN_SET( #{categoryId}, vip_group_category_id_list_ )
-		  	<if test="includeClosed!=null and includeClosed">
+		  	<if test="includeClosed==null">
 				AND (end_time_ IS NULL OR NOW() BETWEEN start_time_ AND end_time_)
 			</if>
 			AND del_flag_=0