From ee2bf95f3472a4179ee0fc7c8e4e2a35e1214bc8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 10:15:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 a3e77c3..9f40e3a 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,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 com.ruoyi.common.core.web.domain.BasePojo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,7 +26,7 @@
 @EqualsAndHashCode(callSuper = false)
 @TableName("t_app_user_sign")
 @ApiModel(value="TAppUserSign对象", description="")
-public class TAppUserSign extends BasePojo {
+public class TAppUserSign implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -39,14 +40,19 @@
 
     @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")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
 

--
Gitblit v1.7.1