From 6f54cebf07887237f5eb8efdf9d1d0b784dbaa49 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 10:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 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 130235b..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,10 +1,12 @@
package com.ruoyi.other.vo;
+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
@@ -52,16 +54,8 @@
@ApiModelProperty(value = "门店id")
private Integer shopId;
- @ApiModelProperty(value = "经度")
- private String longitude;
+ @ApiModelProperty(value = "门店列表")
+ private List<Shop> shopList;
- @ApiModelProperty(value = "纬度")
- private String latitude;
-
- @ApiModelProperty(value = "门店名称")
- private String name;
-
- @ApiModelProperty(value = "详细地址")
- private String address;
}
--
Gitblit v1.7.1