From 8cdadf81127b9d34a54d250a3abc878a8d5339c5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 19:31:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
index 228f113..470b0e5 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
@@ -12,10 +12,13 @@
public class GoodsVO {
@ApiModelProperty(value = "商品id")
- private Long goodsId;
+ private Integer goodsId;
@ApiModelProperty(value = "商品名称")
private String goodsName;
+
+ @ApiModelProperty(value = "限购数量（-1不限购）")
+ private Integer purchaseLimit;
@ApiModelProperty(value = "类型（1=服务商品，2=单品商品）")
private Integer type;
@@ -32,6 +35,13 @@
@ApiModelProperty(value = "详情图，多个逗号分隔")
private String detailPicture;
+ @ApiModelProperty(value = "积分支付（0=否，1=是）")
+ private Integer pointPayment;
+
+ @ApiModelProperty(value = "基础积分")
+ @TableField("integral")
+ private Integer integral;
+
@ApiModelProperty(value = "划线价")
private BigDecimal originalPrice;
@@ -40,4 +50,5 @@
@ApiModelProperty(value = "已售数量")
private Integer saleNum;
+
}
--
Gitblit v1.7.1