From 5c41048a7b55e5df92fc88996ef10e58cbf967d1 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 21 八月 2024 18:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java
index 51772f3..093abfc 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.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;
@@ -40,10 +41,12 @@
@ApiModelProperty(value = "开始时间")
@TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
@TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime endTime;
@ApiModelProperty(value = "跳转类型（1=小程序内页面，2=小程序地址，3=网页地址）")
@@ -58,7 +61,9 @@
@TableField("status")
private Integer status;
-
+ @ApiModelProperty(value = "活动状态 1未开始 2已开始 3已结束")
+ @TableField(exist = false)
+ private Integer startState;
}
--
Gitblit v1.7.1