Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-22 7c220e1e14cb099ac6b7f08b911b037b79cf9da8

 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;


}