Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-27 c7a1a16c8d22b64f9025e800ebaf89b19b530228

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

    /**
     * 项目级联查询