 hanxueqing
|
2ab1d8345d
|
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
|
5 years ago |
|
hanxueqing
|
14748debba
|
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
|
5 years ago |
|
hanxueqing
|
61c81d7dbe
|
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
|
5 years ago |
|
hanxueqing
|
174d6190c7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/java/com/example/PersonalCenter/SearchServiceGet.java
# app/src/main/res/values/strings.xml
|
5 years ago |
|
hanxueqing
|
92fd538451
|
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
|
5 years ago |
 ongbo
|
e8915eca23
|
UPDATE 1
|
5 years ago |
|
hanxueqing
|
53cc181d28
|
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
|
5 years ago |
|
ongbo
|
014e88c7f4
|
UPDATE 1
|
5 years ago |
|
ongbo
|
e1f1f6f051
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/java/com/example/cmknowledgegraph/SearchContent.java
# app/src/main/java/com/example/cmknowledgegraph/SearchEntryActivity.java
|
5 years ago |
|
ongbo
|
43121285a1
|
UPDATE
|
5 years ago |
|
hanxueqing
|
b3d5d646f4
|
111
|
5 years ago |
|
hanxueqing
|
92ea9462b0
|
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
|
5 years ago |
|
hanxueqing
|
488c308cf2
|
ad
|
5 years ago |
 ziyonghong
|
a405175df3
|
add ModifyController
|
5 years ago |
|
hanxueqing
|
7b0f069d3e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
ziyonghong
|
6de2519511
|
.
|
5 years ago |
|
ziyonghong
|
90e478126e
|
update QuestionServiceImpl
|
5 years ago |
|
ziyonghong
|
1c861b7495
|
update
|
5 years ago |
|
hanxueqing
|
da1c5fe6ce
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
ziyonghong
|
603d85f591
|
update LoginRegisterController
|
5 years ago |
|
ziyonghong
|
5f6ff0f9ac
|
add
|
5 years ago |
|
hanxueqing
|
581f8cbb1e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
ziyonghong
|
76d2be3d62
|
update
|
5 years ago |
|
ziyonghong
|
9ecdc19224
|
update
|
5 years ago |
|
ziyonghong
|
9e6299a68d
|
update
|
5 years ago |
|
ziyonghong
|
98a0a72420
|
add Dockerfile
|
5 years ago |
|
hanxueqing
|
de89d85032
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
ziyonghong
|
5c41ad4a07
|
add
|
5 years ago |
|
ziyonghong
|
9b7cd0009c
|
add LoginRegisterController
|
5 years ago |
|
hanxueqing
|
d2db87d19e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
ziyonghong
|
115fc3439a
|
update properties
|
5 years ago |
|
ziyonghong
|
73b9065bf0
|
update
|
5 years ago |
|
ziyonghong
|
9d4c2a76eb
|
QuestionRespository
|
5 years ago |
|
ziyonghong
|
738fadda58
|
Merge branch 'master' of http://bdgit.educoder.net/p01643725/paz2s9bc5
|
5 years ago |
|
ziyonghong
|
aa8c16f144
|
Medicine
|
5 years ago |
|
hanxueqing
|
16e5015ec2
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
hanxueqing
|
af835af1b8
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
hanxueqing
|
4e89c88ec8
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
hanxueqing
|
699f714588
|
b
|
5 years ago |
|
hanxueqing
|
59ba1b39ca
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
hanxueqing
|
240ea0e25d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
hanxueqing
|
26286fce89
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
ziyonghong
|
338826569c
|
change Disease
|
5 years ago |
|
ziyonghong
|
a849eaf729
|
change disease
|
5 years ago |
|
ziyonghong
|
e0e9cce852
|
update
|
5 years ago |
|
ziyonghong
|
d6bdea7d7f
|
update ReturnData
|
5 years ago |
|
ziyonghong
|
7ad6bcad13
|
update QuestionController
|
5 years ago |
|
hanxueqing
|
5cc0d04243
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
ziyonghong
|
eafebd2343
|
rename
|
5 years ago |
|
ziyonghong
|
9711a7aa12
|
test QuestionController
|
5 years ago |
