From 9ff0db3f0cca9eab06d04a9773d725a1acc831d8 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 23 十二月 2025 12:00:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralSettlement.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralSettlement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralSettlement.java
index 0f9a650..7eb1ebf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralSettlement.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralSettlement.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.model;
import java.math.BigDecimal;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
@@ -8,6 +10,8 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -39,19 +43,25 @@
@ApiModelProperty(value = "结算周期")
@TableField("settlement_interval")
+ @Excel(name = "结算周期")
private String settlementInterval;
@ApiModelProperty(value = "结算开始时间")
@TableField("settlement_start_time")
+ @Excel(name = "结算开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate settlementStartTime;
@ApiModelProperty(value = "结算结束时间")
@TableField("settlement_end_time")
+ @Excel(name = "结算结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate settlementEndTime;
@ApiModelProperty(value = "合计结算积分")
@TableField("total_settlement_integral")
- private BigDecimal totalSettlementIntegral;
+ @Excel(name = "结算积分")
+ private Integer totalSettlementIntegral;
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
@@ -71,9 +81,8 @@
@ApiModelProperty("备注")
@TableField("remark")
+ @Excel(name = "备注")
private String remark;
-
-
--
Gitblit v1.7.1