From c27c1f2beb4ca89a94eaa854fce6b4553db8f2f8 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 15 一月 2025 19:58:12 +0800 Subject: [PATCH] 修改 --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java | 41 ++++++++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 7 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 5aeea6e..0ef8657 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 @@ -1,9 +1,6 @@ package com.ruoyi.order.model; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -28,8 +25,9 @@ private static final long serialVersionUID = 1L; - @TableId("id") + @TableId(value = "id", type = IdType.NONE) private Long id; + @TableField(exist = false) private String idStr; @@ -61,18 +59,47 @@ @TableField("pass_status") private Integer passStatus; + @ApiModelProperty(value = "审核时间") + @TableField("auth_time") + private LocalDateTime authTime; + @ApiModelProperty(value = "后台审核备注") @TableField("pass_remark") private String passRemark; @ApiModelProperty(value = "删除标志(0=否,1=是)") @TableField("del_flag") - @TableLogic private Integer delFlag; @ApiModelProperty(value = "添加时间") @TableField("create_time") private LocalDateTime createTime; + + @ApiModelProperty("收货人姓名") + @TableField("name") + private String name; + + @ApiModelProperty("收货人电话") + @TableField("phone") + private String phone; + + @ApiModelProperty("收货地址") + @TableField("address") + private String address; - + @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