From 7a8e31ceb01c7eb27d90197ec91efdfce4bedb41 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 18:00:39 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActProceedingsDao.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActProceedingsDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActProceedingsDao.java
index 38139bb..4ce411c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActProceedingsDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActProceedingsDao.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.ComActProceedingsVO;
import com.panzhihua.service_community.entity.ComActProceedings;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -28,7 +29,7 @@
* @param keyWord 搜索关键字
* @return 处理结果
* */
- List<ComActProceedings> pageProceedings(Page page, @Param("keyWord") String keyWord);
+ List<ComActProceedingsVO> pageProceedings(Page page, @Param("keyWord") String keyWord);
}
\ No newline at end of file
--
Gitblit v1.7.1