From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 03 四月 2025 23:42:57 +0800 Subject: [PATCH] bug修改 --- xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/AppUserTree.java | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/AppUserTree.java b/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/AppUserTree.java index a3f0dea..3da0976 100644 --- a/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/AppUserTree.java +++ b/xinquan-api/xinquan-api-system/src/main/java/com/xinquan/system/api/domain/AppUserTree.java @@ -4,11 +4,14 @@ 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.xinquan.common.core.web.domain.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.time.LocalDateTime; /** * <p> @@ -37,6 +40,13 @@ @ApiModelProperty(value = "树苗等级类型 1=种子 2=发芽 3=幼苗 4=小树苗 5=中等树苗 6=小树 7=中树 8=大树 9=成熟的大树 10=参天大树") @TableField("tree_level_type") private Integer treeLevelType; + @ApiModelProperty(value = "当前树苗总成长值") + @TableField("total") + private Integer total; + @ApiModelProperty(value = "浇灌树苗时间 用于区分是否枯萎 扣除成长值") + @TableField("time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime time; @ApiModelProperty(value = "当前树苗成长值") @TableField("growth_value") @@ -50,18 +60,24 @@ @ApiModelProperty(value = "是否枯萎 1=是 2=否") @TableField("status") private Integer status; + @ApiModelProperty(value = "扣除成长值时间") + @TableField("delTime") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime delTime; @ApiModelProperty(value = "每日疗愈30分钟是否完成 1是2否") - @TableField(exist = false) + @TableField("taskOne") private Integer taskOne; @ApiModelProperty(value = "当前剩余能量值") @TableField(exist = false) private Integer energyValue; @ApiModelProperty(value = "每日疗愈60分钟是否完成 1是2否") - @TableField(exist = false) + @TableField("taskTwo") private Integer taskTwo; @ApiModelProperty(value = "是否完成签到 1是 2否") @TableField(exist = false) private Integer isSign; - + @ApiModelProperty(value = "当前累计能量值") + @TableField(exist = false) + private Integer totalEnergyValue; } -- Gitblit v1.7.1