From 39748c770c83ff1b1e4593c5f24b147361e587c0 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期三, 10 五月 2023 11:16:49 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
index a947e00..0b9bbc9 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java
@@ -30,7 +30,7 @@
* @date 2023年05月06日
* @version: 1.0
*/
-@Api(value = "商户端会员相关接口", tags = "商户端会员相关接口", description = "商户端会员相关接口")
+@Api(value = "商户端任务相关接口", tags = "商户端任务相关接口", description = "商户端任务相关接口")
@RestController
@RequestMapping("/mer/task")
public class MerTaskController {
@@ -104,7 +104,7 @@
}
@RequestMapping(value = "/pageMerAgencyTaskRecord", method = RequestMethod.POST)
- @ApiOperation(value = "分页获取商户会员跟进任务记录列表")
+ @ApiOperation(value = "分页获取商户代理商跟进任务记录列表")
public R<Page<MerAgencyTaskRecordPageVo>> pageMerAgencyTaskRecord(@RequestBody MerAgencyTaskPageDto merAgencyTaskPageDto) {
Long userId = SecurityUtils.getUserId();
merAgencyTaskPageDto.setUserId(userId);
@@ -116,7 +116,7 @@
}
@RequestMapping(value = "/createAgencyTask", method = RequestMethod.POST)
- @ApiOperation(value = "新建会员跟进任务")
+ @ApiOperation(value = "新建代理商跟进任务")
public R createAgencyTask(@RequestBody MerCreateAgencyTaskDto merCreateAgencyTaskDto) {
Long userId = SecurityUtils.getUserId();
merCreateAgencyTaskDto.setUserId(userId);
@@ -125,7 +125,7 @@
}
@RequestMapping(value = "/followAgencyTask", method = RequestMethod.POST)
- @ApiOperation(value = "会员任务跟进")
+ @ApiOperation(value = "会员代理商跟进")
public R followAgencyTask(@RequestBody MerFollowAgencyTaskDto merFollowAgencyTaskDto) {
Long userId = SecurityUtils.getUserId();
merFollowAgencyTaskDto.setUserId(userId);
--
Gitblit v1.7.1