 ongbo
|
9527908f0d
|
update search and IDEA
|
5 years ago |
 hanxueqing
|
dfa41daf43
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
hanxueqing
|
8bc0f8d228
|
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
|
48b8ee3b02
|
personalcenter update2
|
5 years ago |
|
ongbo
|
c7f1d9b13b
|
personalcenter
|
5 years ago |
|
ongbo
|
1eebc6509e
|
UPDATE 1
|
5 years ago |
|
ongbo
|
dd207daf39
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
ongbo
|
5e14975ba7
|
UPDATE 1
|
5 years ago |
|
hanxueqing
|
5623f532c0
|
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
|
15eebaa706
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
hanxueqing
|
0a43ee1a7a
|
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
|
e6288af322
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
ongbo
|
10b597d55d
|
UPDATE 1
|
5 years ago |
|
hanxueqing
|
cbc4c193e8
|
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
|
cd21fbca9b
|
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
|
35b1e60173
|
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
|
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
|
43121285a1
|
UPDATE
|
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
|
7b0f069d3e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
hanxueqing
|
da1c5fe6ce
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
hanxueqing
|
581f8cbb1e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
hanxueqing
|
de89d85032
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
hanxueqing
|
d2db87d19e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
hanxueqing
|
16e5015ec2
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
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 |
|
hanxueqing
|
5cc0d04243
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
hanxueqing
|
15e2953e4a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
|
hanxueqing
|
fd9237301d
|
update
|
5 years ago |
|
hanxueqing
|
a8a1b75333
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
|
5 years ago |
