Merge branch 'local_20221010' into huacheng_test

yanghui

2022-10-10 c60eea0ab4d74ab8f39a33f896e978dc591f1800

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java

@@ -84,6 +84,7 @@
    @PostMapping("/page")
    public R page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) {
        ComEventVO comEventVO = CopyUtil.copyProperties(comEventPageRequestVO, ComEventVO.class);
        comEventPageRequestVO.setCreateBy(getUserId());
        return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize());
    }

@@ -119,7 +120,7 @@
            @ApiImplicitParam(name = "specterId", value = "专家ID", required = true, dataType = "Long"),
    })
    @PutMapping("/accept/Request")
    public R acceptRequest(@RequestParam("id") Long id, @RequestParam("specterId") Long specterId) {
    public R acceptRequest( Long id,  Long specterId) {
        return comEventService.acceptRequest(id, specterId);
    }