From 5728732f45cc45f3c5cbde0abe7a7c5efee605b9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 09 十二月 2024 15:31:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..df17beb 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;
@@ -73,6 +71,22 @@
@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;
}
--
Gitblit v1.7.1