Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

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

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.service_grid.service.EventGridDataService;
import com.panzhihua.service_grid.service.LcCompareCodeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

@@ -27,6 +28,8 @@

    @Resource
    private EventGridDataService eventGridDataService;
    @Resource
    private LcCompareCodeService lcCompareCodeService;


    /**
@@ -166,4 +169,15 @@
    public R deleteGridDataByAdmin(@RequestBody List<Long> Ids){
        return eventGridDataService.deleteGridDataByAdmin(Ids);
    }

    /**
     * 综治后台-查询所有市平台网格列表
     * @return  市平台网格列表
     */
    @GetMapping("/lc/list")
    public R getLcGridLists(){
        return lcCompareCodeService.getLcGridLists();
    }


}