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

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsBargainPrice.java |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsBargainPrice.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsBargainPrice.java
index 28c7444..b9b2e87 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsBargainPrice.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsBargainPrice.java
@@ -8,6 +8,7 @@
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -20,7 +21,7 @@
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("t_goods_bargain_price")
-@ApiModel(value="GoodsBargainPrice对象", description="")
+@ApiModel(value="门店特殊价格对象", description="")
 public class GoodsBargainPrice implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -35,7 +36,7 @@
 
     @ApiModelProperty(value = "门店id")
     @TableField("shop_id")
-    private Integer shopId;
+    private Integer  shopId;
 
     @ApiModelProperty(value = "审核状态(0=待审核,1=审核通过,2=审核失败)")
     @TableField("audit_status")
@@ -43,7 +44,7 @@
 
     @ApiModelProperty(value = "审核人id")
     @TableField("audit_user_id")
-    private Integer auditUserId;
+    private Long auditUserId;
 
     @ApiModelProperty(value = "审核时间")
     @TableField("audit_time")
@@ -64,7 +65,37 @@
 
     @ApiModelProperty(value = "添加用户id")
     @TableField("create_user_id")
-    private Integer createUserId;
+    private Long createUserId;
 
+    @TableField(exist = false)
+    private List<GoodsBargainPriceDetail> goodsBargainPriceDetailList;
+
+    @ApiModelProperty(value = "商品名称")
+    @TableField(exist = false)
+    private String goodsName;
+
+    @ApiModelProperty(value = "所属分类")
+    @TableField(exist = false)
+    private String categoryName;
+
+    @ApiModelProperty(value = "分类id")
+    @TableField(exist = false)
+    private Integer categoryId;
+
+    @ApiModelProperty(value = "门店名称")
+    @TableField(exist = false)
+    private String shopName;
+
+    @ApiModelProperty(value = "店长名称")
+    @TableField(exist = false)
+    private String ownerName;
+
+    @ApiModelProperty(value = "店长手机号")
+    @TableField(exist = false)
+    private String ownerPhone;
+
+    @ApiModelProperty(value = "商品类型")
+    @TableField(exist = false)
+    private Integer goodsType;
 
 }

--
Gitblit v1.7.1