From c168f544ecd041760e7d0fba66c48e06b9ab67dc Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 16:51:21 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java
index 0cd504b..900dfde 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java
@@ -26,7 +26,7 @@
* @param commonPage
* @return
*/
- IPage<ComActColumn> pageList(Page page, @Param("commonPage") CommonPage commonPage);
+ IPage<ComActColumnVO> pageList(Page page, @Param("commonPage") CommonPage commonPage);
/**
* 项目级联查询
--
Gitblit v1.7.1