Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

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

@@ -12,7 +12,7 @@
 * 分类列表(ComActColumn)表数据库访问层
 *
 * @author makejava
 * @since 2021-10-20 17:28:12
 * @since 2021-11-01 14:38:25
 */
@Mapper
public interface ComActColumnDao extends BaseMapper<ComActColumn> {
@@ -22,5 +22,6 @@
     * @param commonPage
     * @return
     */
    IPage<ComActColumn> pageList(Page page, @Param("commonPage")CommonPage commonPage);
    IPage<ComActColumn> pageList(Page page, @Param("commonPage") CommonPage commonPage);

}