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

# Conflicts:
#	server/svr-configuration/src/main/resources/bootstrap.yml

server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthWjwConfigService.java

@@ -136,6 +136,7 @@ public class OauthWjwConfigService {
                    basePatientWechatDao.save(patientWechatDo);
                }
                return patient;
            }