From a3ded5d8e0c4f750fb4ad190e165ddeb8446f05a Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 09 八月 2024 16:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
index d64bb4d..f11efbe 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
@@ -2,16 +2,16 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.other.api.domain.TEnterpriseUserApplication;
import com.ruoyi.other.service.TEnterpriseUserApplicationService;
-import com.sun.xml.internal.bind.v2.TODO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
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;
/**
@@ -36,9 +36,17 @@
/**
* 添加计费策略管理
*/
+ @Log(title = "添加集团用户申请", businessType = BusinessType.INSERT)
@ApiOperation(tags = {"小程序-计费策略"},value = "添加集团用户申请")
@PostMapping(value = "/add")
- public AjaxResult<Boolean> add(@RequestBody TEnterpriseUserApplication dto) {
+ public AjaxResult<Boolean> add(@Validated @RequestBody TEnterpriseUserApplication dto) {
+ // TODO 用户id
+ return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
+ }
+
+ @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "集团用户列表")
+ @PostMapping(value = "/page")
+ public AjaxResult<Boolean> page(@RequestBody TEnterpriseUserApplication dto) {
// TODO 用户id
return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
}
--
Gitblit v1.7.1