# Conflicts: # xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java # xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/orderevaluateinfo/OrderEvaluateInfo.java # xinelu-nurse-manage/src/main/resources/mapper/manage/orderevaluateinfo/OrderEvaluateInfoMapper.xml |
||
|---|---|---|
| .. | ||
| i18n | ||
| META-INF | ||
| mybatis | ||
| application-dev.yml | ||
| application-prod.yml | ||
| application.yml | ||
| banner.txt | ||
| logback.xml | ||
| xinyilu_apiclient_key.pem | ||
| yiluyoupin_apiclient_key.pem | ||