From 37018ce6810f4855f43374f47cbd7b5e0d70d5a5 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 13:04:38 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
index b77006c..e2a729b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
@@ -105,11 +105,11 @@
@Override
public R getIntegralCommunityTradeApplets(ComActIntegralCommunityRankDTO communityTradeDTO){
if(communityTradeDTO.getType().equals(ComActIntegralCommunityRankDTO.type.resident)){
- communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.type.resident);
+ communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.identityType.resident);
}else if(communityTradeDTO.getType().equals(ComActIntegralCommunityRankDTO.type.party)){
- communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.type.party);
+ communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.identityType.party);
}else if(communityTradeDTO.getType().equals(ComActIntegralCommunityRankDTO.type.volunteer)){
- communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.type.volunteer);
+ communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.identityType.volunteer);
}
return R.ok(this.baseMapper.getIntegralCommunityTradeApplets(new Page(communityTradeDTO.getPageNum(),communityTradeDTO.getPageSize()),communityTradeDTO));
}
--
Gitblit v1.7.1