From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
index f5ed8da..876606c 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
@@ -2,29 +2,28 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@Data
@TableName("energy_period")
-@ApiModel
+@Schema
public class EnergyPeriod {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鏃ユ湡
*/
- @ApiModelProperty("鏃ユ湡")
+ @Schema(description = "鏃ユ湡")
@Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date date;
/**
* 鍗曚环
*/
- @ApiModelProperty("鍗曚环")
+ @Schema(description = "鍗曚环")
@Excel(name = "鍗曚环")
private Double price;
/**
@@ -35,28 +34,28 @@
/**
* 宄版
*/
- @ApiModelProperty("宄版")
+ @Schema(description = "宄版")
@Excel(name = "宄版")
private Double peak;
/**
* 璋锋
*/
- @ApiModelProperty("璋锋")
+ @Schema(description = "璋锋")
@Excel(name = "璋锋")
private Double valley;
/**
* 骞虫
*/
- @ApiModelProperty("骞虫")
+ @Schema(description = "骞虫")
@Excel(name = "骞虫")
private Double flat;
/**
* 灏栨
*/
- @ApiModelProperty("灏栨")
+ @Schema(description = "灏栨")
@Excel(name = "灏栨")
private Double sharp;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
--
Gitblit v1.9.3