From 1d3013d7df551314521df23be1901276b24849da Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 24 八月 2024 14:03:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
index 9c550a5..fddfeb5 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
@@ -3,6 +3,8 @@
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 com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -38,11 +40,15 @@
@ApiModelProperty(value = "签到天")
@TableField("sign_day")
+ @JsonFormat(pattern = "dd", timezone = "GMT+8")
private LocalDate signDay;
@ApiModelProperty(value = "奖励积分")
@TableField("reward_points")
private Integer rewardPoints;
+ @ApiModelProperty(value = "礼盒标记")
+ @TableField("is_gift")
+ private Integer isGift;
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
--
Gitblit v1.7.1