From dfd423f90894d24081e7d7da08d09498898ee9c2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 17 二月 2025 14:16:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
index 87a0230..5a99b2a 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -77,6 +78,7 @@
@ApiModelProperty(value = "使用截止时间")
@TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime endTime;
@ApiModelProperty(value = "获取后有效天数")
@@ -104,8 +106,8 @@
private BigDecimal vipPaymentAmount;
@ApiModelProperty(value = "优惠券说明")
- @TableField("explain")
- private String explain;
+ @TableField("explains")
+ private String explains;
@ApiModelProperty(value = "说明")
@TableField("remark")
@@ -120,6 +122,10 @@
@TableField(exist = false)
private Integer useCount;
+ @ApiModelProperty(value = "销量")
+ @TableField(exist = false)
+ private Integer salesCount;
+
}
--
Gitblit v1.7.1