Merge branch 'dev' of yeshijie/wlyy2.0 into dev

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

@@ -147,7 +147,7 @@ public class RegisterService {
                patient.setIdcard(idcard);
            }
            if(StringUtils.isNoneBlank(openid)){
                patient.setIdcard(openid);
                patient.setOpenid(openid);
            }
            BasePatientDO temp = basePatientDao.save(patient);