From 7cddb7125f2095facea68c11068e269809ef4108 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 24 十二月 2024 15:41:10 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 d9b5f37..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
@@ -47,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")
@@ -139,5 +139,15 @@
@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