From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java
index df80270..9f23b47 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java
@@ -89,4 +89,19 @@
 
     @ApiModelProperty(value = "好友帮砍价记录列表")
     private List<ComBatteryCommodityOrderBargainRecordVo> orderBargainRecordList;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "用户头像")
+    private String imageUrl;
+
+    @ApiModelProperty(value = "商品名称")
+    private String commodityName;
+
+    @ApiModelProperty(value = "商品图片")
+    private String commodityImages;
+
+    @ApiModelProperty(value = "砍价状态(1.砍价中 2.砍价成功 3.砍价失败)")
+    private Integer bargainStatus;
 }

--
Gitblit v1.7.1