Merge branch 'develop' into 'master'

fix

See merge request lyh3024/knowledge_graph!18

route/views.py

@@ -60,7 +60,7 @@ def get_first_ips(province, city, isp, root_ip, from_time, end_time):
             query_extend.append('f.root_ip = $root_ip ')
         if from_time and end_time:
             params['from_time'] = from_time.timestamp()
-            params['ent_time'] = end_time.timestamp()
+            params['end_time'] = end_time.timestamp()
             query_extend.append('n.date >= $from_time ')
             query_extend.append('n.date <= $end_time ')
         if len(query_extend) != 0: