Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ActivityGoodsGetVo.java

@@ -15,6 +15,9 @@
@Data
public class ActivityGoodsGetVo {

    @ApiModelProperty(value = "活动名称")
    private String activityName;

    @ApiModelProperty(value = "秒杀活动价")
    private BigDecimal activityPrice;