Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e

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

    /**
     * 项目级联查询