From c980c8c2cd9403393db6a3f42705612a0a4d4511 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 15:49:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java
index 043bfc2..d5b374b 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -52,10 +54,12 @@
@ApiModelProperty(value = "活动开始日期")
@TableField("start_time")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
@ApiModelProperty(value = "活动结束日期")
@TableField("end_time")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
@ApiModelProperty(value = "满x元")
@@ -66,5 +70,26 @@
@TableField("discount")
private BigDecimal discount;
+ @ApiModelProperty(value = "是否上架：0否 1是")
+ @TableField("is_shelf")
+ private Integer isShelf;
+
+ @ApiModelProperty(value = "活动状态:0未开始，1已开始")
+ @TableField(exist = false)
+ private Integer status;
+
+ @ApiModelProperty(value = "主键字符串")
+ @TableField(exist = false)
+ private String idStr;
+
+ @ApiModelProperty(value = "会员名称")
+ @TableField(exist = false)
+ private String vipName;
+
+ public String getIdStr() {
+ return String.valueOf(id);
+ }
+
+
}
--
Gitblit v1.7.1