From abbb3326355de35bcb535deba49d8da704d92d63 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 10:49:50 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
index 3f047aa..2c1bff9 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
@@ -12,6 +12,7 @@
import com.xzx.gc.user.mapper.AccountMapper;
import com.xzx.gc.user.mapper.RedPaperRuleMapper;
import com.xzx.gc.user.service.DistribService;
+import com.xzx.gc.user.vo.DistribInfoListVo;
import com.xzx.gc.user.vo.DistribListVo;
import com.xzx.gc.user.vo.ViewSettingVo;
import io.swagger.annotations.Api;
@@ -77,7 +78,7 @@
return JsonResult.success("操作成功！");
}
- @ApiOperation(value = "团长列表")
+ @ApiOperation(value = "符合条件待入选团长列表")
@ApiResponses(
@ApiResponse(code = 200, message = "success", response = DistribListVo.class)
)
@@ -116,6 +117,15 @@
return JsonResult.success("操作成功！");
}
+ @ApiOperation(value = "团长列表")
+ @ApiResponses(
+ @ApiResponse(code = 200, message = "success", response = DistribInfoListVo.class)
+ )
+ @PostMapping(value = Constants.ADMIN_VIEW_PREFIX + "/distrib/distribInfoList.json")
+ public JsonResult<Map<String, Object>> distribInfoList(@RequestBody DistribInfoListDto distribInfoListDto) {
+ return JsonResult.success(distribService.distribInfoList(distribInfoListDto));
+ }
+
}
--
Gitblit v1.9.1