From d20a4aade6f9ed5111b496ac9abdff9f05f81535 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 15 一月 2025 22:32:02 +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 | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 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 bb331c4..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,13 @@ 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) @@ -90,5 +95,10 @@ @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