From da8edafa9803834b08061fd30ac79f8c249900b8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 22 七月 2022 16:39:37 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ 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