Merge branch 'master' into test

puhanshu

2021-12-29 ca4034c3a285f2c22fa19e5eaa88d505b5588c0b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java

@@ -19,4 +19,11 @@
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * 删除
     * @param id
     * @return
     */
    R delete(Long id);
}