From 0406a3a2f3cfb2b081f4ca94352f19f301685c84 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 11:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
index cd1e819..45e60a1 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
@@ -9,6 +9,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -28,7 +29,7 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ private Integer id;
@ApiModelProperty(value = "名称")
@TableField("name")
@@ -46,9 +47,9 @@
@TableField("purchase_limit")
private Integer purchaseLimit;
- @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
+ @ApiModelProperty(value = "配送方式（1=自提，2=快递，1,2 = 自提+快递）")
@TableField("distribution_mode")
- private Integer distributionMode;
+ private String distributionMode;
@ApiModelProperty(value = "指定门店（1=指定，2=所有）")
@TableField("appoint_store")
@@ -122,5 +123,31 @@
@TableField(exist = false)
private Integer vipId;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "指定门店")
+ private List<GoodsShop> goodsShopList;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "指定用户")
+ private List<GoodsAppUser> goodsAppUserList;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "会员价格")
+ private List<GoodsVip> goodsVipList;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "地区价格")
+ private List<GoodsArea> goodsAreaList;
+
+ @TableField(exist = false)
+ private String categoryName;
+
+ @TableField(exist = false)
+ private Integer showStatus;
+
+ public String getIdStr() {
+ return String.valueOf(id);
+ }
+
}
--
Gitblit v1.7.1