From 4e89c88ec878b9298ebba8908eca414866cbc8a5 Mon Sep 17 00:00:00 2001
From: hanxueqing <1045352474@qq.com>
Date: Sat, 4 Jan 2020 00:08:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml
---
 .../com/example/cmknowledgegraph/SearchContentActivity.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/example/cmknowledgegraph/SearchContentActivity.java b/app/src/main/java/com/example/cmknowledgegraph/SearchContentActivity.java
index 9632b6c..1d61ff8 100644
--- a/app/src/main/java/com/example/cmknowledgegraph/SearchContentActivity.java
+++ b/app/src/main/java/com/example/cmknowledgegraph/SearchContentActivity.java
@@ -33,7 +33,8 @@ public class SearchContentActivity extends AppCompatActivity {
         //遍历label和content的队列，显示内容
         for(int i=1;i< SearchServiceGet.label.size();i++){
             TextView text_label=findViewById(R.id.search_content);
-
+            text_label.setText(SearchServiceGet.label.get(i));
+//            text_la
         }