From e0a4cb2de00feaa1852105b6d83e5a239571989b Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 11 九月 2024 15:27:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 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 6b744dc..830e8fb 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 @@ -8,6 +8,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.log.enums.OperatorType; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.other.api.domain.TEnterpriseUserApplication; import com.ruoyi.other.query.PassDto; @@ -55,7 +56,7 @@ return AjaxResult.ok(enterpriseUserApplicationService.save(dto)); } - @Log(title = "添加集团用户申请", businessType = BusinessType.INSERT) + @Log(title = "【集团用户申请】添加集团用户申请", businessType = BusinessType.INSERT) @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "后台添加集团用户申请") @PostMapping(value = "/back/add") public AjaxResult<Boolean> backAdd(@Validated @RequestBody TEnterpriseUserApplication dto) { @@ -80,8 +81,9 @@ return R.ok(page); } } - - + + + @Log(title = "【集团用户申请】填写备注", businessType = BusinessType.INSERT) @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "备注") @PostMapping(value = "/remark") public AjaxResult pass(@RequestBody PassDto passDto) { @@ -92,8 +94,9 @@ enterpriseUserApplicationService.updateById(byId); return AjaxResult.success(); } - - @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "备注") + + @Log(title = "【集团用户申请】删除申请数据", businessType = BusinessType.DELETE) + @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "删除") @DeleteMapping(value = "/delete") public AjaxResult delete(String ids) { String[] split = ids.split(","); -- Gitblit v1.7.1