From 50dfdaf4e3220e7c1f93a189879ea92bb8f46b4c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 六月 2025 17:58:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TExchangeOrder.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TExchangeOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TExchangeOrder.java
index 0cf63cf..4f4f81b 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TExchangeOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TExchangeOrder.java
@@ -31,6 +31,9 @@
@TableId(value = "id", type = IdType.NONE)
private Long id;
+ @ApiModelProperty(value = "地址json")
+ @TableField("address_json")
+ private String addressJson;
@ApiModelProperty(value = "订单编号")
@TableField("code")
private String code;
@@ -81,7 +84,7 @@
@ApiModelProperty(value = "发货人id")
@TableField("consigner_id")
- private Integer consignerId;
+ private Long consignerId;
@ApiModelProperty(value = "发货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -100,6 +103,28 @@
@ApiModelProperty(value = "取消人id")
@TableField("cancellation_id")
- private Integer cancellationId;
+ private Long cancellationId;
+ @ApiModelProperty(value = "收货人")
+ @TableField(exist = false)
+ private String receivingName;
+ @ApiModelProperty(value = "收货地址")
+ @TableField(exist = false)
+ private String receivingAddress;
+ @ApiModelProperty(value = "发货人")
+ @TableField(exist = false)
+ private String consignerName;
+ @ApiModelProperty(value = "取消人")
+ @TableField(exist = false)
+ private String cancellationName;
+ @ApiModelProperty(value = "商品名称")
+ @TableField(exist = false)
+ private String name;
+ @ApiModelProperty(value = "下单手机号")
+ @TableField(exist = false)
+ private String phone;
+ @ApiModelProperty(value = "订单id")
+ @TableField(exist = false)
+ private String uid;
+
}
--
Gitblit v1.7.1