From ff399ed346334267d075d0ae7586936b680650f7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 15:28:28 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 a41a2d3..408b550 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")
@@ -102,9 +103,9 @@
@TableField("sale_num")
private Integer saleNum;
- @ApiModelProperty(value = "商品权限JSON（0=全部，1=游客，2=普通会员，3=黄金会员，4=钻石会员，5=准代理，6=代理，7=总代，8=合伙人）")
+ @ApiModelProperty(value = "商品权限 逗号分隔（0=全部，1=游客，2=普通会员，3=黄金会员，4=钻石会员，5=准代理，6=代理，7=总代，8=合伙人）")
@TableField("commodity_authority")
- private Integer commodityAuthority;
+ private String commodityAuthority;
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
@@ -119,5 +120,24 @@
@TableField("status")
private Integer status;
+ @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;
+
}
--
Gitblit v1.7.1