Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into medicare

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/dict/WlyyHospitalSysDictDao.java
#	business/base-service/src/main/java/com/yihu/jw/hospital/dict/service/WlyyHospitalSysDictService.java
#	svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/WlyyHospitalSysDictEndpoint.java
#	svr/svr-base/src/main/resources/application.yml
#	svr/svr-base/src/main/resources/bootstrap.yml