From ef3996043992d97eaf5a0da6b02bad70dcfddf8f Mon Sep 17 00:00:00 2001 From: zhibing.pu <393733352@qq.com> Date: 星期五, 16 八月 2024 15:31:25 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java index 6db70fe..4c80295 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java @@ -1,15 +1,12 @@ package com.ruoyi.other.controller; import java.time.LocalDateTime; -import java.util.Date; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.other.api.domain.THtml; import com.ruoyi.other.api.domain.TIntegralRule; -import com.ruoyi.other.api.dto.SaveIntegralDTO; import com.ruoyi.other.service.THtmlService; import com.ruoyi.other.service.TIntegralRuleService; import io.swagger.annotations.ApiImplicitParam; @@ -36,8 +33,8 @@ - @PostMapping("/getSet") - @ApiOperation(value = "获取积分设置") + @GetMapping("/getSet") + @ApiOperation(tags = {"管理后台-积分管理"},value = "获取积分设置") public R<TIntegralRule> getSet() { TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>()); return R.ok(res); @@ -46,13 +43,13 @@ @PostMapping("/saveSet") - @ApiOperation(value = "保存积分设置") + @ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分设置") public R saveSet(@RequestBody TIntegralRule dto) { integralRuleService.updateById(dto); return R.ok(); } @GetMapping("/getInfo") - @ApiOperation(value = "type 1=积分规则说明," + + @ApiOperation(tags = {"管理后台-积分管理"},value = "type 1=积分规则说明," + "2=会员折扣说明," + "3=优惠券说明," + "4=双倍积分说明," + @@ -68,7 +65,7 @@ return R.ok(g.getContent()); } @GetMapping("/saveInfo") - @ApiOperation(value = "保存积分说明") + @ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分说明") @ApiImplicitParams({ @ApiImplicitParam(name = "info", value = "内容", required = true), @ApiImplicitParam(name = "type", value = "type 1=积分规则说明,\" +\n" + -- Gitblit v1.7.1