From f4a69a925645fe0c84121fde76ec03aff1b07939 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 14 一月 2025 11:24:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java index 16ea67a..7d06b35 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java @@ -59,6 +59,10 @@ @TableField("pass_status") private Integer passStatus; + @ApiModelProperty(value = "审核时间") + @TableField("auth_time") + private LocalDateTime authTime; + @ApiModelProperty(value = "后台审核备注") @TableField("pass_remark") private String passRemark; @@ -86,6 +90,8 @@ @ApiModelProperty("快递单号") @TableField("code") private String code; - - + + @ApiModelProperty("收货地址JSON") + @TableField(exist = false) + private String addressJson; } -- Gitblit v1.7.1