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

CeDo

2021-06-03 5d1e6dbb4a9abff2ef984058914b73e7f2ced736

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

@@ -13,6 +13,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * DAO
 *
@@ -45,5 +47,5 @@
     * @param eventGridTodoDataDTO
     * @return
     */
    UserEventGridDataVO getGridTodoData(@Param("eventGridTodoDataDTO") EventGridTodoDataDTO eventGridTodoDataDTO);
    List<UserEventGridDataVO> getGridTodoData(@Param("eventGridTodoDataDTO") EventGridTodoDataDTO eventGridTodoDataDTO);
}