From f28142767f8823667499e6e94a76789f601f1654 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 16 十二月 2024 13:34:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 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 89d0ba8..b47c109 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 @@ -11,6 +11,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; /** * <p> @@ -60,5 +61,25 @@ @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) + private LocalDateTime startTime; + + @ApiModelProperty(value = "结束时间") + @TableField(exist = false) + private LocalDateTime endTime; + + @TableField(exist = false) + private List<Long> userIds; + } -- Gitblit v1.7.1