From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 04 七月 2025 20:39:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppShoppingCartAddDto.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppShoppingCartAddDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppShoppingCartAddDto.java index f2ec3d9..4d6c85e 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppShoppingCartAddDto.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppShoppingCartAddDto.java @@ -1,5 +1,6 @@ package com.ruoyi.order.domain.dto; +import com.ruoyi.system.api.domain.dto.AppBaseDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,13 +12,13 @@ * @version: 1.0 */ @Data -public class AppShoppingCartAddDto extends AppBaseDto{ +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; -- Gitblit v1.7.1