From 8bb3523d3b43cb8e6e25c5883300f87c883a4dea Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 21:12:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java | 18 +++++++++++++++++-
1 files changed, 17 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 470b0e5..3c7f3dc 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
@@ -1,11 +1,14 @@
package com.ruoyi.other.vo;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.other.api.domain.GoodsEvaluate;
+import com.ruoyi.other.api.domain.Shop;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
@ApiModel(value="商品热销对象", description="热门商品")
@Data
@@ -35,11 +38,14 @@
@ApiModelProperty(value = "详情图，多个逗号分隔")
private String detailPicture;
+
+ @ApiModelProperty(value = "现金支付（0=否，1=是）")
+ private Integer cashPayment;
+
@ApiModelProperty(value = "积分支付（0=否，1=是）")
private Integer pointPayment;
@ApiModelProperty(value = "基础积分")
- @TableField("integral")
private Integer integral;
@ApiModelProperty(value = "划线价")
@@ -51,4 +57,14 @@
@ApiModelProperty(value = "已售数量")
private Integer saleNum;
+ @ApiModelProperty(value = "门店id")
+ private Integer shopId;
+
+ @ApiModelProperty(value = "门店列表")
+ private List<Shop> shopList;
+
+ @ApiModelProperty("评价")
+ private GoodsEvaluate goodsEvaluate;
+
+
}
--
Gitblit v1.7.1