Merge branch 'zhao' into 'master'

把esmm 预测后的日记队列数量由1000改回500

See merge request !31

eda/esmm/Model_pipline/train.py

@@ -378,7 +378,7 @@ def trans(x):
 def set_join(lst):
     l = lst.unique().tolist()
     r = [str(i) for i in l]
-    r =r[:1000]
+    r =r[:500]
     return ','.join(r)
 
 def df_sort(result,queue_name):