Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/dto/GoodsSkuInfoDTO.java

@@ -19,15 +19,15 @@

    @ApiModelProperty(value = "商品id")
    @NotNull(message = "商品id不能为空")
    private Long goods_sku_id;
    private Long goodsSkuId;

    @ApiModelProperty(value = "秒杀价格")
    @NotNull(message = "秒杀价格不能为空")
    private BigDecimal skillPrice;
    private BigDecimal seckillPrice;

    @ApiModelProperty(value = "秒杀库存")
    @NotNull(message = "秒杀库存不能为空")
    private Integer skillStock;
    private Integer seckillStock;

    @ApiModelProperty(value = "限购数量")
    private Integer limitNumber;