Merge branch 'weiyimin' into 'master'

Weiyimin See merge request zhaojianwei/bi-report!11

Merge branch 'weiyimin' into 'master'
Weiyimin See merge request zhaojianwei/bi-report!11
222d5a02 · 赵建伟 · f538306f · 019e780b · 222d5a02 · 222d5a02
Commit 222d5a02 authored Jun 22, 2020 by 赵建伟
12 changed files
--- a/.DS_Store
+++ b/.DS_Store
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
--- a/jobs/.DS_Store
+++ b/jobs/.DS_Store
--- a/jobs/daily_recommend_strategy/.DS_Store
+++ b/jobs/daily_recommend_strategy/.DS_Store
--- a/jobs/search_related/step1_2.job
+++ b/jobs/search_related/step1_2.job
+#step1_2.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online bl_hdfs_maidian_updates
\ No newline at end of file
--- a/sqls/.DS_Store
+++ b/sqls/.DS_Store
--- a/sqls/bak/meigou-detail-page/meigou-detail-page-dispense-pv.sql
+++ b/sqls/bak/meigou-detail-page/meigou-detail-page-dispense-pv.sql
@@ -297,6 +297,6 @@ FROM
    )t1
    LATERAL VIEW explode(t1.channel) t2 AS channel
    GROUP BY t1.partition_date,t1.device_type,t1.active_type,t2.channel
-    )T1
+)T1
 ORDER BY `日期` desc,`设备类型`,`活跃类型`,`渠道`

--- a/sqls/daily_content_data_insert/daily_content_data_insert.sql
+++ b/sqls/daily_content_data_insert/daily_content_data_insert.sql
--- a/tables/create_daliy_content.sql
+++ b/tables/create_daliy_content.sql
--- a/tables/create_search_click_path.sql
+++ b/tables/create_search_click_path.sql
--- a/tables/create_search_input_type.sql
+++ b/tables/create_search_input_type.sql
--- a/tables/create_search_result_click_rate.sql
+++ b/tables/create_search_result_click_rate.sql