Merge branch 'weiyimin' into 'master'

push codes

See merge request !107

pm/daily_push/etl/daily_push.sql

@@ -401,6 +401,7 @@ full join
                 ,device_id,msg_id,'ios' as device_os_type
         from bl.bl_et_bg_trackingpushlog_inc_d
         where partition_day= regexp_replace(DATE_SUB(current_date,1) ,'-','')
+        and (device_type is null or device_type='ios')--在7.35新增了android的埋点，故7.35之后新增了device_type字段
         group by partition_day,device_id,msg_id
 
         union all
@@ -492,7 +493,7 @@ FROM
     FROM
     (
         select partition_day
-                ,device_id,msg_id
+                ,device_id,msg_id,case when device_type='android' then 'android' else 'ios' end as device_os_type
         from bl.bl_et_bg_trackingpushlog_inc_d
         where partition_day=regexp_replace(DATE_SUB(current_date,1) ,'-','')
         group by partition_day,device_id,msg_id