Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-11 10c27ab0aac1816cde172496b8126edd26a8d1ac

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java

@@ -632,11 +632,13 @@
                        comMngPopulationDAO.updateById(comMngPopulationDO);
                        comElderAuthElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
                        comElderAuthElderliesDO.setPhone(comElderAuthRecordVO.getPhone());
                        comElderAuthElderliesDO.setIdCard(null);
                        comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO);
                        ComPensionAuthPensionerDO comPensionAuthPensionerDO=comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda().eq(ComPensionAuthPensionerDO::getPopulationId,comMngPopulationDO.getId()));
                        if(comPensionAuthPensionerDO!=null){
                            comPensionAuthPensionerDO.setAddress(comElderAuthRecordVO.getAddress());
                            comPensionAuthPensionerDO.setPhone(comElderAuthRecordVO.getPhone());
                            comPensionAuthPensionerDO.setIdCard(null);
                            comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO);
                        }
                        return R.ok();