From 2871a439237eb244b83cbcf072552dc35ce6dcd8 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期一, 16 十二月 2024 16:21:38 +0800 Subject: [PATCH] 1 --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java index 9a98d9d..a533fe2 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java +++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,6 +12,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; /** * <p> @@ -38,11 +40,15 @@ @ApiModelProperty(value = "历史余额") @TableField("historical_point") - private BigDecimal historicalPoint; + private Integer historicalPoint; @ApiModelProperty(value = "变动金额") @TableField("variable_point") - private BigDecimal variablePoint; + private Integer variablePoint; + + @ApiModelProperty(value = "变动后余额") + @TableField("balance") + private Integer balance; @ApiModelProperty(value = "变动时间") @TableField("create_time") @@ -56,5 +62,27 @@ @TableField("object_id") private Long objectId; + @ApiModelProperty(value = "用户名称") + @TableField(exist = false) + private String userName; + + @ApiModelProperty(value = "联系电话") + @TableField(exist = false) + private String phone; + + + @ApiModelProperty(value = "开始时间") + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startTime; + + @ApiModelProperty(value = "结束时间") + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endTime; + + @TableField(exist = false) + private List<Long> userIds; + } -- Gitblit v1.7.1