Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-07-22 da8edafa9803834b08061fd30ac79f8c249900b8

 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);

    /**
     * 项目级联查询