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

huanghongfa

2021-06-05 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java

@@ -2,10 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
@@ -23,17 +20,17 @@

    /**
     * 新增网格和网格员的关联关系
     * @param eventGridMemberRelationAddDTO
     * @param eventGridMemberAddDTO
     * @return 新增结果
     */
    R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO);
    R add(EventGridMemberAddDTO eventGridMemberAddDTO);

    /**
     * 修改网格和网格员的关联关系
     * @param eventGridMemberRelationEditDTO
     * @param eventGridMemberEditDTO
     * @return 维护结果
     */
    R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO);
    R edit(EventGridMemberEditDTO eventGridMemberEditDTO);

    /**
     * 分页查找网格和网格员的关联关系
@@ -64,4 +61,6 @@
    R getMapGridListByApp(Long userId);




}