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

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/myFamily/MyFamilyService.java

@@ -607,10 +607,10 @@ public class MyFamilyService {
            map.put("applyPatientNonage",this.nonageByIdcard(createPatient.getIdcard()));//1成年，2未成年
            map.put("explain","您的"+role.get(converRole-1)+createPatient.getName()+"邀请您绑定家人账号");
            result.add(map);
            BaseMessageDO msg = messageService.findById(Integer.valueOf(one.get("id")+""));
            msg.setReadState(1);
            msg.setReadTime(new Date());
            messageService.save(msg);
//            BaseMessageDO msg = messageService.findById(Integer.valueOf(one.get("id")+""));
//            msg.setReadState(1);
//            msg.setReadTime(new Date());
//            messageService.save(msg);
        }
        return result;
    }