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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java

@@ -1,20 +1,14 @@
package com.panzhihua.service_grid.api;

import javax.annotation.Resource;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;

import lombok.extern.slf4j.Slf4j;

/**
 *
@@ -22,7 +16,7 @@
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
 */
@Slf4j
@RestController
@RequestMapping("/eventgridmemberrelation")
@@ -33,6 +27,7 @@

    /**
     * 查询市平台网格员列表
     * 
     * @return  市平台网格员列表
     */
    @GetMapping("/lc/list")
@@ -44,7 +39,5 @@
    public R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO){
        return eventGridMemberRelationService.gridMemberCascadeList(memberCascadeAddDTO);
    }



}