From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java
index 1e844a1..2ddf054 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java
@@ -1,5 +1,10 @@
 package com.panzhihua.service_community.dao;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,10 +12,6 @@
 import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAdminVO;
 import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO;
 import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * @auther lyq
@@ -22,15 +23,20 @@
 
     /**
      * 分页查询邻里圈话题列表
-     * @param circleTopicAdminDTO   请求参数
-     * @return  邻里圈话题列表
+     * 
+     * @param circleTopicAdminDTO
+     *            请求参数
+     * @return 邻里圈话题列表
      */
-    IPage<ComActNeighborCircleTopicAdminVO> pageNeighborTopicByAdmin(Page page, @Param("circleTopicAdminDTO") ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);
+    IPage<ComActNeighborCircleTopicAdminVO> pageNeighborTopicByAdmin(Page page,
+        @Param("circleTopicAdminDTO") ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);
 
     /**
      * 小程序查询邻里圈话题列表
-     * @param communityId   社区id
-     * @return  邻里圈话题列表
+     * 
+     * @param communityId
+     *            社区id
+     * @return 邻里圈话题列表
      */
     List<ComActNeighborCircleTopicAppVO> getNeighborTopicByApp(@Param("communityId") Long communityId);
 }

--
Gitblit v1.7.1