From 756a4201880e9208d395526f18cfd015aa3ff6a7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 03 十一月 2024 23:36:58 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TRepair.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TRepair.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TRepair.java
index 49f609b..7038166 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TRepair.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TRepair.java
@@ -1,11 +1,13 @@
package com.ruoyi.chargingPile.api.model;
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;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -37,10 +39,16 @@
@ApiModelProperty(value = "站点id")
@TableField("site_id")
private Integer siteId;
+
+ @TableField(exist = false)
+ private String siteName;
@ApiModelProperty(value = "充电桩id")
@TableField("charging_pile_id")
private Integer chargingPileId;
+
+ @TableField(exist = false)
+ private String chargingPileName;
@ApiModelProperty(value = "报修内容")
@TableField("content")
@@ -48,6 +56,8 @@
@ApiModelProperty(value = "报修时间")
@TableField("repair_time")
+ @DateTimeFormat(pattern = "yyyy-MM-ddTHH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime repairTime;
--
Gitblit v1.7.1