Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-05-10 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppShoppingCartAddDto.java

@@ -14,11 +14,11 @@
@Data
public class AppShoppingCartAddDto extends AppBaseDto {

    @ApiModelProperty(value = "shopId",hidden = true)
    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty(value = "商品id")
    private Long goodsId;
    private String goodsId;

    @ApiModelProperty(value = "购买数量")
    private Integer buyNum;