Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGoodsPageVo.java

@@ -1,6 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -16,16 +17,22 @@
@Data
public class AppUserOrderGoodsPageVo {

    @ApiModelProperty("订单商品id")
    @ApiModelProperty(value="订单商品id")
    private String orderGoodsId;

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

    @ApiModelProperty("商品名称")
    @ApiModelProperty(value="商品名称")
    private String goodsName;

    @ApiModelProperty("商品图片")
    @ApiModelProperty(value = "商品简介")
    private String goodsIntroduction;

    @ApiModelProperty(value="商品标签")
    private String goodsTag;

    @ApiModelProperty(value="商品图片")
    private String goodsPicture;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
@@ -35,16 +42,19 @@
    private Integer buyNum;

    @ApiModelProperty(value = "商品售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsPrice;

    @ApiModelProperty(value = "商品实际价格")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsRealPrice;

    @ApiModelProperty("周期标记")
    @ApiModelProperty(value="周期标记")
    private Integer cycleNumFlag;

    @ApiModelProperty("服务次数")
    @ApiModelProperty(value="服务次数")
    private Integer serviceNum;


    @ApiModelProperty(value = "优惠券id")
    private String couponId;
}