Merge branch 'cooperation_video_candidate_pool_improved_lld_0509' into test

api-module/src/main/resources/mapper/contentplatform/ext/ContentPlatformPlanMapperExt.xml

@@ -446,13 +446,12 @@
 
     <select id="getSelectedQwVideoList"
             resultType="com.tzld.piaoquan.api.model.vo.contentplatform.VideoContentItemVO">
-        select t.videoId, t.title, t.cover, t.video, t.experimentId
+        select t.videoId, t.title, t.cover, t.video, 'history_selected' as experimentId
         from (
             select v.video_id as videoId,
                    v.title as title,
                    v.cover as cover,
                    v.video as video,
-                   v.experiment_id as experimentId,
                    v.create_timestamp as latestTs,
                    row_number() over (partition by v.video_id order by v.create_timestamp desc) as rn
             from content_platform_qw_plan_video v
@@ -486,13 +485,12 @@
 
     <select id="getSelectedGzhVideoList"
             resultType="com.tzld.piaoquan.api.model.vo.contentplatform.VideoContentItemVO">
-        select t.videoId, t.title, t.cover, t.video, t.experimentId
+        select t.videoId, t.title, t.cover, t.video, 'history_selected' as experimentId
         from (
             select v.video_id as videoId,
                    coalesce(nullif(v.custom_title, ''), v.title) as title,
                    coalesce(nullif(v.custom_cover, ''), v.cover) as cover,
                    v.video as video,
-                   v.experiment_id as experimentId,
                    v.create_timestamp as latestTs,
                    row_number() over (partition by v.video_id order by v.create_timestamp desc) as rn
             from content_platform_gzh_plan_video v