From 8e6cdfe05d08bdacc62d5eaca49b514150bcfb6f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 13:06:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
index 5ca828a..4efccf5 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
@@ -143,6 +143,10 @@
@TableField("express_json")
private String expressJson;
+ @ApiModelProperty(value = "第三方快递结果")
+ @TableField("express_result")
+ private String expressResult;
+
@ApiModelProperty(value = "收货地址信息")
@TableField("address_json")
private String addressJson;
--
Gitblit v1.7.1