Merge branch 'develop' into 'master'

add properties

See merge request lyh3024/knowledge_graph!15

block/views.py

@@ -72,7 +72,7 @@ def get_block_list(request):
             # 账户
             transactions = []
             for a in accounts:
-                resp_nodes.append(gen_node_with_properties_json(a, {"dealNum": deal_amount_dict.get(a.address)}))
+                resp_nodes.append(gen_node_with_properties_json(a, {"dealAmount": deal_amount_dict.get(a.address)}))
                 node_ids.append(a.id)
                 next_nodes = a.transfer_out.all()
                 for next_node in next_nodes: