From e9d451862a9f9458c82f18d7bd2c2cfdac44ac0b Mon Sep 17 00:00:00 2001 From: zhibing.pu <393733352@qq.com> Date: 星期四, 22 八月 2024 14:01:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/ExchangeDto.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/ExchangeDto.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/ExchangeDto.java index 9c3969d..d0d3c50 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/ExchangeDto.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/ExchangeDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.other.api.dto; +package com.ruoyi.common.core.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,5 +14,10 @@ @ApiModelProperty(hidden = true) Long userId; + @ApiModelProperty("1商品2优惠卷") + Integer goodType; + @ApiModelProperty(hidden = true) + Integer point; + } -- Gitblit v1.7.1