From ff811ae8df41273d7ab0011b6b7f1f278f03bbd2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 十二月 2024 18:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java
index 4c8c7d4..cb7d138 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java
@@ -1,8 +1,18 @@
 package com.ruoyi.account.controller;
 
 
+import com.ruoyi.account.api.model.AgentApplication;
+import com.ruoyi.account.service.AgentApplicationService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.other.api.domain.VipSetting;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
 
 /**
  * <p>
@@ -14,7 +24,16 @@
  */
 @RestController
 @RequestMapping("/agent-application")
-public class AgentApplicationController {
+public class AgentApplicationController extends BaseController {
+    @Resource
+    private AgentApplicationService agentApplicationService;
+
+    @PostMapping("/apply")
+    @ApiOperation(value = "会员申请", tags = {"会员中心-小程序"})
+    public R<Void> apply(@RequestBody AgentApplication agentApplication) {
+        agentApplicationService.apply(agentApplication);
+        return R.ok();
+    }
 
 }
 

--
Gitblit v1.7.1