Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml

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);
 
         }