Merge branch 'master' of http://git.wanmeizhensuo.com/ML/ffm-baseline

delet show()

ctr-56.py

@@ -29,7 +29,8 @@ def ctr_all():
     db = pymysql.connect(host='10.66.157.22', port=4000, user='root', passwd='3SYz54LS9#^9sBvC', db='jerry_prod')
     cursor = db.cursor()
     sql_active = "select distinct device_id from data_feed_exposure " \
-                 "where cid_type = 'diary' and device_id regexp'[5|6]$' and stat_date = '{}';".format(date)
+                 "where (cid_type = 'diary' or cid_type = 'diary_video') " \
+                 "and device_id regexp'[5|6]$' and stat_date = '{}';".format(date)
     cursor.execute(sql_active)
     result = cursor.fetchall()
     tail56 = pd.DataFrame(list(result))[0].values.tolist()