From c5e522c0baa2f6f53014982c8e8a1f969910bfd1 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 19 五月 2021 16:49:24 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index df67a41..cdb1caf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/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);
}
}
--
Gitblit v1.7.1