Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-11 10c27ab0aac1816cde172496b8126edd26a8d1ac

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

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