From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 13:55:11 +0800
Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java
index e644402..4076b80 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java
@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
@@ -51,10 +52,10 @@
public R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO){
Long houseCommunityId = comOpsHouseDTO.getHouseCommunityId();
if(houseCommunityId!=null) {
- R<ComMngStructAreaDO> r = comMngStructAreaService.detailArea(houseCommunityId);
+ R<ComMngStructAreaVO> r = comMngStructAreaService.detailArea(houseCommunityId);
if(R.isOk(r)&&r.getData()!=null) {
- ComMngStructAreaDO comMngStructAreaDO = r.getData();
- comOpsHouseDTO.setHouseCommunityName(comMngStructAreaDO.getAreaName());
+ ComMngStructAreaVO comMngStructAreaVO = r.getData();
+ comOpsHouseDTO.setHouseCommunityName(comMngStructAreaVO.getAreaName());
}
}
--
Gitblit v1.7.1