Merge branch 'master' of http://bdgit.educoder.net/p01643725/paz2s9bc5

# Conflicts:
#	cmkg/pom.xml
#	cmkg/src/main/java/com/cmkg/cmkg/CmkgApplication.java
#	cmkg/src/main/java/com/cmkg/cmkg/Controller/QuestionController.java
#	cmkg/src/main/java/com/cmkg/cmkg/database/ReturnData.java
#	cmkg/src/main/java/com/cmkg/cmkg/node/medicine.java
#	cmkg/src/main/java/com/cmkg/cmkg/process/ModelProcess.java
#	cmkg/src/main/java/com/cmkg/cmkg/repository/MedicineRespository.java
#	cmkg/src/main/java/com/cmkg/cmkg/repository/QuestionRespository.java
#	cmkg/src/main/java/com/cmkg/cmkg/server/QuestionService.java
#	cmkg/src/main/java/com/cmkg/cmkg/server/impl/QuestionServiceImpl.java
#	cmkg/src/main/resources/application.properties

app/src/main/java/com/example/SearchCenter/SearchEntryActivity.java

@@ -231,6 +231,7 @@ public class SearchEntryActivity extends AppCompatActivity implements CardStackV
              * 药——操作方法
              * nhm能治什么病 ，nhm的证候，nhm的功能
              */
+
             TextView textView_1=findViewById(R.id.asscoiate_entry);
             TextView textView_2=findViewById(R.id.asscoiate_entry);
             TextView textView_3=findViewById(R.id.asscoiate_entry);