From cadeca36ff86f74371c77a05dc8422abc1e48855 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 16:28:40 +0800
Subject: [PATCH] feat(table): 添加合计行功能 - 在 mallMemberList.html 中添加了 totalRow 属性，用于显示碳币和碳积分的合计 - 在 moneyFlowList.html 中移除了 description 字段的 totalRow属性 - 在 sellVipList.html 中将 amount 和 amountFee 字段的 totalRow 属性改为 true
---
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
index abca442..538eb5d 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -74,7 +74,7 @@
private BigDecimal carriage;
@ApiModelProperty(value = "备注")
- private BigDecimal remark;
+ private String remark;
public Integer getPayMethodType() {
if (this.payMethod == null) {
@@ -124,5 +124,8 @@
private Integer deliveryState;
@ApiModelProperty(value = "是否送货上门 1：是 2：否")
private Integer isHome;
+
+ @ApiModelProperty(value = "是否赠送 1-是 2-否")
+ private Integer isFree;
}
--
Gitblit v1.9.1