From 119ccc4f2bed0f07b5807e0ff1d4e00301e674bd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 18:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 bdbdcba..33c9844 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
@@ -113,7 +113,7 @@
@TableField("point")
private Integer point;
- @ApiModelProperty(value = "1wx2积分")
+ @ApiModelProperty(value = "1微信，2账户余额，3积分")
@TableField("pay_method")
private Integer payMethod;
@@ -128,6 +128,10 @@
@ApiModelProperty(value = "运费")
@TableField("express_amount")
private BigDecimal expressAmount;
+
+ @ApiModelProperty(value = "1微信，2账户余额")
+ @TableField("express_pay_method")
+ private Integer expressPayMethod;
@ApiModelProperty(value = "第三方快递信息")
@TableField("express_json")
--
Gitblit v1.7.1