From d51a8cfa10c34d9c1e7d6b4726d31e75ecee5dc6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 20 十二月 2024 18:32:03 +0800
Subject: [PATCH] 1

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java |   18 ++++++++++++++++--
 1 files changed, 16 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 5f2772f..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")
@@ -124,16 +124,30 @@
     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