From cbad982befcf58521b224da1e8898c23c5e0d2c6 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 29 五月 2025 16:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TScreenContent.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TScreenContent.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TScreenContent.java
index debe154..ef41a69 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TScreenContent.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TScreenContent.java
@@ -30,15 +30,15 @@
@TableField("green_electricity_today")
@ApiModelProperty("今日绿电消纳值")
- private BigDecimal greenElectricityToday;
+ private BigDecimal greenElectricityToday=BigDecimal.ZERO;
@TableField("car_discharge")
@ApiModelProperty("累计汽车放电量")
- private BigDecimal carDischarge;
+ private BigDecimal carDischarge=BigDecimal.ZERO;
@TableField("green_electricity")
@ApiModelProperty("累计绿电消纳电量")
- private BigDecimal greenElectricity;
+ private BigDecimal greenElectricity=BigDecimal.ZERO;
@TableField("title")
@ApiModelProperty("标题")
@@ -83,15 +83,15 @@
@TableField("statistical_deadline")
@ApiModelProperty("截止统计日期")
@JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDateTime statisticalDeadline;
+ private Date statisticalDeadline;
@TableField("create_time")
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
+ private Date createTime;
@TableField("update_time")
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
\ No newline at end of file
--
Gitblit v1.7.1