同步代码

This commit is contained in:
mi9688
2024-11-28 16:58:21 +08:00
parent a6e7644afe
commit 01fd0b4ca5
7 changed files with 43 additions and 17 deletions

View File

@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
@ -106,12 +107,13 @@ private static final long serialVersionUID = 1L;
private Integer delFlag;
/** 保存时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("保存时间")
private Date saveTime;
/** 数据实时时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "数据实时时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("数据实时时间")
private Date realTime;

View File

@ -3,6 +3,7 @@ package com.fastbee.deviceData.domain;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
@ -207,11 +208,13 @@ private static final long serialVersionUID = 1L;
private Long control;
/** 保存时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("保存时间")
private Date saveTime;
/** 实时时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("实时时间")
private Date realTime;

View File

@ -123,13 +123,13 @@ private static final long serialVersionUID = 1L;
private String status;
/** 保存时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("保存时间")
private Date saveTime;
/** 实时时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("实时时间")
private Date realTime;