# Conflicts:
#	bsoft-api/src/main/java/com/bsoft/api/controller/SerDiseaseController.java
#	bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/Disease.java