From c08e13eb2c875a160b3f30acaa6d01306c19b444 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 17 一月 2025 17:59:36 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java | 22 ++++++++++++++++++++-- 1 files changed, 20 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..b5606ad 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,14 @@ @TableField("pass_status") private Integer passStatus; + @ApiModelProperty(value = "审核时间") + @TableField("auth_time") + private LocalDateTime authTime; + + @ApiModelProperty(value = "平台收货时间") + @TableField("receive_time") + private LocalDateTime receiveTime; + @ApiModelProperty(value = "后台审核备注") @TableField("pass_remark") private String passRemark; @@ -86,6 +94,16 @@ @ApiModelProperty("快递单号") @TableField("code") private String code; - - + + @ApiModelProperty("收货地址JSON") + @TableField(exist = false) + private String addressJson; + + @ApiModelProperty(value = "第三方快递结果") + @TableField("express_result") + private String expressResult; + + @ApiModelProperty("最新快递信息") + @TableField(exist = false) + private String express; } -- Gitblit v1.7.1