From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 28d08e6..6569362 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,12 @@
package com.ruoyi.other.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
+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
@@ -39,7 +40,6 @@
private Integer pointPayment;
@ApiModelProperty(value = "基础积分")
- @TableField("integral")
private Integer integral;
@ApiModelProperty(value = "划线价")
@@ -50,4 +50,12 @@
@ApiModelProperty(value = "已售数量")
private Integer saleNum;
+
+ @ApiModelProperty(value = "门店id")
+ private Integer shopId;
+
+ @ApiModelProperty(value = "门店列表")
+ private List<Shop> shopList;
+
+
}
--
Gitblit v1.7.1