Merge branch 'weiyimin' into 'master'

push codes

See merge request !78

pm/daily_content/en-cn.properties

 daily_content=内容日报-简化版
-home_content-detail=首页内容数据-分日明细
+home_content_detail=首页内容数据-分日明细
 home_content_by_month=首页内容数据-月均
 ai_content_detail=ai内容数据-分日明细
 ai_content_by_month=ai内容数据-月均
\ No newline at end of file

pm/daily_content/report/home_content_by_month.sql

@@ -21,9 +21,9 @@ FROM
             ,active_type
             ,channel
             ,round(avg(dau),0) as dau
-            ,round(avg(retention_rate_2),2) as retention_rate_2
-            ,round(avg(retention_rate_3),2) as retention_rate_3
-            ,round(avg(retention_rate_7),2) as retention_rate_7
+            ,round(avg(if(retention_rate_2=0,NULL,retention_rate_2)),2) as retention_rate_2
+            ,round(avg(if(retention_rate_3=0,NULL,retention_rate_3)),2) as retention_rate_3
+            ,round(avg(if(retention_rate_7=0,NULL,retention_rate_7)),2) as retention_rate_7
             ,round(avg(home_card_click_uv),0) as home_card_click_uv
             ,round(avg(home_card_click_pv),0) as home_card_click_pv
             ,round(avg(home_good_click),0) as home_good_click