合并代码

puzhibing

2024-12-20 32b3913cb2a475ac2d6ff3fdca69059ae9f107c2

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java

@@ -8,6 +8,7 @@
import com.ruoyi.other.service.BannerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -29,7 +30,9 @@
    private BannerService bannerService;
    @GetMapping("/list")
   @ApiOperation(value = "banner列表", tags = {"小程序-banner"})
   public R<List<Banner>> list(String name, Integer jumpType, Integer position){
   public R<List<Banner>> list(@ApiParam("名称") String name,
                                @ApiParam("跳转类型（1=无跳转，2=外部链接，3=商品详情，4=秒杀商品详情，5=领券中心）") Integer jumpType,
                                @ApiParam("位置（1=首页，2=商城首页）") Integer position){
        List<Banner> list = bannerService.lambdaQuery().like(StringUtils.isNotEmpty(name), Banner::getName, name)
                .eq(jumpType!=null,Banner::getJumpType, jumpType)
                .eq(position!=null,Banner::getPosition, position)