数据合并

湖分兑换剩余

src/main/java/com/peanut/modules/master/controller/UserMergeController.java

@@ -0,0 +1,34 @@
+package com.peanut.modules.master.controller;
+
+import com.peanut.common.utils.R;
+import com.peanut.modules.master.service.UserMergeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
+
+/**
+ * 合并用户
+ */
+@Slf4j
+@RestController("masterUserMerge")
+@RequestMapping("master/userMerge")
+public class UserMergeController {
+
+    @Autowired
+    private UserMergeService mergeService;
+
+
+
+    @RequestMapping("/userMerge")
+    public R userMerge(@RequestBody Map<String, Object> params) {
+        mergeService.userMerge(params);
+        return null;
+    }
+
+
+
+
+}