From 0a43447534ca364ceccda80257566466e6329dd4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 六月 2025 19:18:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/EvaluatePageVO.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/EvaluatePageVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/EvaluatePageVO.java
index c40fbd8..00d506a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/EvaluatePageVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/EvaluatePageVO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,6 +24,9 @@
@TableField("user_id")
private Integer userId;
+ @ApiModelProperty("用户ID(昵称)")
+ private String userNo;
+
@ApiModelProperty("用户手机号")
@TableField("user_phone")
private String userPhone;
@@ -30,6 +34,9 @@
@ApiModelProperty("订单id")
@TableField("order_id")
private String orderId;
+
+ @ApiModelProperty("订单编号")
+ private String orderNumber;
@ApiModelProperty("评价内容")
@TableField("content")
@@ -39,6 +46,12 @@
@TableField("worker_id")
private Integer workerId;
+ @ApiModelProperty("师傅姓名")
+ private String workerName;
+
+ @ApiModelProperty("师傅电话")
+ private String workerPhone;
+
@ApiModelProperty("评价星级")
@TableField("star_rating")
private Double starRating;
@@ -46,33 +59,17 @@
@ApiModelProperty("服务单号")
@TableField("serve_no")
private String serveNo;
-
- @TableField("createBy")
- private String createBy;
-
- @TableField("updateBy")
- private String updateBy;
+// @TableField("createBy")
+// private String createBy;
+// @TableField("updateBy")
+// private String updateBy;
@TableField("createTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
-
- @TableField("updateTime")
- private Date updateTime;
@ApiModelProperty("是否删除 0未删除;1已删除")
@TableField("is_delete")
private Integer isDelete;
-
- @ApiModelProperty("用户ID(昵称)")
- private String userNo;
-
- @ApiModelProperty("订单编号")
- private String orderNumber;
-
- @ApiModelProperty("师傅姓名")
- private String workerName;
-
- @ApiModelProperty("师傅电话")
- private String workerPhone;
}
--
Gitblit v1.7.1