From 56d62d9edb0dda9ae678dcea2323144db5d11c22 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 28 十二月 2024 18:06:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 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 4e6f8d7..a9e902d 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>
@@ -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")
@@ -108,7 +109,6 @@
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
@@ -119,8 +119,38 @@
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "排序")
+ @TableField("sort")
+ private Integer sort;
+
@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