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/ApiOrderProfitVo.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java
index 53d0928..b069962 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.mall.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,10 +28,14 @@
     @ApiModelProperty(value = "1:未提成 2:已提成")
     private Integer state;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "创建时间")
     private Date createdTime;
 
     @ApiModelProperty(value = "产品名称")
-    private String goodsName;;
+    private String goodsName;
+
+    @ApiModelProperty(value = "下单人昵称")
+    private String nickname;
 
 }

--
Gitblit v1.9.1