From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
index 61442c4..c0101a2 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
@@ -2,14 +2,13 @@
import com.baomidou.mybatisplus.annotation.*;
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;
@Data
@TableName("electricity_consumption_area")
-@ApiModel
+@Schema
public class ElectricityConsumptionArea {
@TableId(value = "id", type = IdType.AUTO)
@@ -18,13 +17,13 @@
/**
* 鍖哄煙鍚嶇О
*/
- @ApiModelProperty("鍖哄煙鍚嶇О")
+ @Schema(description = "鍖哄煙鍚嶇О")
private String areaName;
/**
* 鍖哄煙绫诲瀷
*/
- @ApiModelProperty("鍖哄煙绫诲瀷")
+ @Schema(description = "鍖哄煙绫诲瀷")
private String areaType;
/**
* 鎺掑簭
@@ -40,7 +39,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
--
Gitblit v1.9.3