Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2 天以前 a966dafb8877552267a94fe8c544c5ea72cf5650

 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;