From 8ad5a84a2675d85977cbfb6020f4905f4dd8090a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 15:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsEvaluate.java | 25 +++++++++++++++++++++++--
1 files changed, 23 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 2de0d6f..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,6 +4,7 @@
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;
@@ -62,11 +63,11 @@
@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;
@@ -75,9 +76,29 @@
private String avatar;
- @ApiModelProperty(value = "名字")
+ @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