From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
index b915deb..b086212 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
@@ -62,7 +62,6 @@
}
circleTopicDO = new ComActNeighborCircleTopicDO();
BeanUtils.copyProperties(addCircleTopicAdminDTO, circleTopicDO);
- circleTopicDO.setStatus(1);
circleTopicDO.setCreateAt(new Date());
circleTopicDO.setCreateBy(addCircleTopicAdminDTO.getUserId());
@@ -113,8 +112,8 @@
* @return 邻里圈话题列表
*/
@Override
- public R getNeighborTopicByApp(Long communityId,Integer isZero){
- return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero));
+ public R getNeighborTopicByApp(Long communityId,Integer isZero,String name){
+ return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero,name));
}
/**
--
Gitblit v1.7.1