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

yanghui

2022-11-10 ec96abc7c3d9ef48b00c321eed85f9d934c699a5

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActProceedingsDao.java

@@ -30,4 +30,5 @@
     * */
    List<ComActProceedings> pageProceedings(Page page, @Param("keyWord") String keyWord);


}