Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-07 0ab1b864458f36b294933112824b10b13770915e

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java

@@ -124,7 +124,7 @@
    }

    @RequestMapping(value = "/followAgencyTask", method = RequestMethod.POST)
    @ApiOperation(value = "会员代理商跟进")
    @ApiOperation(value = "代理商跟进")
    public R followAgencyTask(@RequestBody MerFollowAgencyTaskDto merFollowAgencyTaskDto) {
        Long userId = SecurityUtils.getUserId();
        merFollowAgencyTaskDto.setUserId(userId);