From 3f9f3c40338190497d42c891dc0690789b834df6 Mon Sep 17 00:00:00 2001 From: zhangmei <645025773@qq.com> Date: 星期三, 12 二月 2025 13:19:55 +0800 Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into xizang-changyun --- ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java index c1b1ff4..144fd34 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java @@ -4,12 +4,15 @@ 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; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; /** * <p> @@ -42,5 +45,14 @@ @TableField("voucher") private String voucher; + @ApiModelProperty(value = "用户ID") + @TableField("user_id") + private String userId; + + @ApiModelProperty(value = "支付时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("pay_time") + private Date payTime; + } -- Gitblit v1.7.1