解决代码冲突

huanghongfa

2021-06-23 13ccebf29ce191cc97b1d584d4bf7aa6084ebce0

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java

@@ -115,4 +115,5 @@
     */
    IPage<EventSpecialPopulationVO> specialPopulationList(Page page, @Param("specialPopulationDTO") PageEventSpecialPopulationDTO specialPopulationDTO);


}