From 347737414ce8552486d16fc62ab29138a94304a8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 19 三月 2024 12:34:43 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java | 2 --
1 files changed, 0 insertions(+), 2 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 7ac7379..e66bd9e 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
@@ -85,8 +85,6 @@
return R.ok();
}
-
-
@RequestMapping(value = "/pageMerAgencyTask", method = RequestMethod.POST)
@ApiOperation(value = "分页获取商户代理商跟进任务列表")
public R<Page<MerAgencyTaskPageVo>> pageMerAgencyTask(@RequestBody MerAgencyTaskPageDto merAgencyTaskPageDto) {
--
Gitblit v1.7.1