From b7202456508af8a387a01fc99c2f554859fc4f19 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 May 2021 19:30:29 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange-back into yunding
---
src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
index f8753ab..71f6371 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
@@ -27,6 +27,37 @@
public class ViewController extends BaseController{
private final IMemberService memberService;
+
+ public static long idFromMember;
+
+ /**
+ *会员列表---会员活动领取---详情
+ */
+ @GetMapping("seeReceiveInfo/{id}")
+ public String seeReceiveInfo(@PathVariable long id, Model model) {
+ idFromMember = id;
+ return FebsUtil.view("modules/member/seeReceiveInfo");
+ }
+
+ /**
+ * 会员列表---会员活动领取
+ * @return
+ */
+ @GetMapping("memberActivityReceive")
+ @RequiresPermissions("memberActivityReceive:view")
+ public String memberActivityReceive() {
+ return FebsUtil.view("modules/member/memberActivityReceive");
+ }
+
+ /**
+ * 平台全部信息
+ * @return
+ */
+ @GetMapping("allDataInfoView")
+ @RequiresPermissions("allDataInfoView:view")
+ public String allDataInfoView() {
+ return FebsUtil.view("modules/member/allData/allDataInfo");
+ }
@GetMapping("addCoin/{id}")
@RequiresPermissions("addCoin:update")
--
Gitblit v1.9.1