From 3c923d976c45df37ea752153e12107a3a29437e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 17:54:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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..261499c 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
@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -39,10 +41,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")
@@ -58,12 +63,42 @@
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
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