From 6fae0cb364948d490a55c8aba5879a436e8ee17e Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期五, 08 八月 2025 14:30:45 +0800 Subject: [PATCH] yys 1.协同审批增加附件上传 2.新增薪酬模块 --- src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java index 4ed1aff..c6562aa 100644 --- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java +++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java @@ -11,6 +11,7 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.Date; /** * @author :yys @@ -96,7 +97,7 @@ @ApiModelProperty("杩愯鏃堕棿") @Excel(name = "杩愯鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate runDate; + private Date runDate; /** * 姣忔棩闄愬埗鐢甸噺 -- Gitblit v1.9.3