Merge branches '2.0' and '2.0' of http://120.76.84.145:10101/gitblit/r/java...

huliguo

5 天以前 7a74745bad7ff20df9e170433c1e1cb851ce7fa9

 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;