Merge branch 'cedoodev' into test

CeDo

2021-05-19 575e94e9db7e507ecec2441d24a13e9415fd9f03

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -1576,7 +1576,7 @@
            eldersAuthDO.setBirthDay(birthDay);
            int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
            if(add==1){
                return R.ok();
                return R.ok(eldersAuthDO.getId());
            }
        }else{
            return R.fail("家庭成员年龄还未达到80");
@@ -1603,6 +1603,6 @@
     */
    @PostMapping("/eldersauth/eldersAuthQuery")
    R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO){
        return eldersAuthService.query(pageEldersAuthDTO);
        return eldersAuthService.queryExportData(pageEldersAuthDTO);
    }
}