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

# Conflicts:
#	common/common-entity/sql记录

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);