Merge remote-tracking branch 'origin/dev' into dev

business/base-service/src/main/java/com/yihu/jw/hospital/family/service/WlyyFamilyMemberService.java

@@ -134,6 +134,9 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
            result = wlyyPatientFamilyMemberDao.findOne(id);
            basePatientDO = basePatientDao.findById(result.getFamilyMember());
            patientMappingDO = patientMappingDao.findByPatient(result.getFamilyMember());
            if (patientMappingDO==null){
                patientMappingDO = patientMappingDao.findByIdcard(idCard);
            }
        }
        String dictName = "";

server/svr-authentication/src/main/java/com/yihu/jw/security/utils/SignGenerator.java

@@ -42,7 +42,7 @@ public class SignGenerator {
//
        String url = "https://huaxia.yanketong.com/api/ext/ykt/open/account/login/mobile-only";
        Map<String, Object> params1 = new HashMap<>();
        params1.put("mobile", "17602157210");
        params1.put("mobile", "15070498837");
        String res = requestYkt(params1,url);
        JSONObject resObj = JSONObject.parseObject(res);
        if (resObj.getString("code").equalsIgnoreCase("200")){