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

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

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