From c5aa21a54a9595a5ae382ede00c14e3caf6bb1b9 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 14 Jan 2026 10:48:29 +0800
Subject: [PATCH] Merge branch 'AI-ADMIN-V3' of http://120.27.238.55:7000/r/xc-mall into AI-ADMIN-V3
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
index 98d59df..e9d1bc5 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -25,6 +25,8 @@
private Date orderTime;
private Date payTime;
+ //支付积分
+ private BigDecimal scoreAmount;
private BigDecimal amount;
@@ -107,12 +109,6 @@
@TableField(exist = false)
private String addressPic;
@TableField(exist = false)
- private String province;
- @TableField(exist = false)
- private String city;
- @TableField(exist = false)
- private String township;
- @TableField(exist = false)
private String addressArea;
@TableField(exist = false)
private String detailAddress;
@@ -142,4 +138,6 @@
@TableField(exist = false)
private String expressNo;
+
+ private Integer isFree;
}
--
Gitblit v1.9.1