Merge branch 'online1' into exits_music_group_5_6

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

@@ -185,7 +185,7 @@
 			vip_group_activity
 		WHERE
 			FIND_IN_SET( #{categoryId}, vip_group_category_id_list_ )
-			AND (NOW() < end_time_ OR end_time_ IS NULL)
+			AND (end_time_ IS NULL OR NOW() BETWEEN start_time_ AND end_time_)
 			AND del_flag_=0
 			AND INTE_ARRAY(organ_id_,#{organIds})
 	</select>