From 0406a3a2f3cfb2b081f4ca94352f19f301685c84 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 11:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java
index b4c2140..5ae1646 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java
@@ -10,6 +10,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -39,10 +40,13 @@
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
private Long appUserId;
+ @ApiModelProperty(value = "订单id")
+ @TableField("order_id")
+ private Long orderId;
@ApiModelProperty(value = "评分")
@TableField("grade")
- private Integer grade;
+ private BigDecimal grade;
@ApiModelProperty(value = "评价内容")
@TableField("comment")
@@ -66,4 +70,34 @@
private LocalDateTime createTime;
+ @ApiModelProperty(value = "头像")
+ @TableField(exist = false)
+ private String avatar;
+
+
+ @ApiModelProperty(value = "评价用户")
+ @TableField(exist = false)
+ private String userName;
+
+ @ApiModelProperty(value = "联系电话")
+ @TableField(exist = false)
+ private String phone;
+
+ @ApiModelProperty(value = "商品名字")
+ @TableField(exist = false)
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品图片")
+ @TableField(exist = false)
+ private String goodsImg;
+
+ @TableField(exist = false)
+ private String idStr;
+
+ public void setId(Long id) {
+ this.id = id;
+ if (id != null){
+ this.idStr = String.valueOf(id);
+ }
+ }
}
--
Gitblit v1.7.1