From 5b73f899c41957496ee0e4257a8e8bd38fc51d37 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 24 九月 2026 14:50:10 +0800
Subject: [PATCH] 天津-智科电子 1.协同办公-协同审批：待审批节点，第三人账号不可进行修改 2.营销管理-销售台账：勾选单个导出会出现整个导出的情况，但只能显示父项、不能显示子项 3.营销管理-销售台账：点击下拉没有价格，点击详情有价格
---
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
index e022468..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,30 +17,33 @@
/**
* 鍖哄煙鍚嶇О
*/
- @ApiModelProperty("鍖哄煙鍚嶇О")
- @Excel(name = "鍖哄煙鍚嶇О")
+ @Schema(description = "鍖哄煙鍚嶇О")
private String areaName;
/**
* 鍖哄煙绫诲瀷
*/
- @ApiModelProperty("鍖哄煙绫诲瀷")
- @Excel(name = "鍖哄煙绫诲瀷")
+ @Schema(description = "鍖哄煙绫诲瀷")
private String areaType;
/**
* 鎺掑簭
*/
- @TableField(fill = FieldFill.INSERT)
private Long sort;
/**
* 鐖剁被id
*/
- @TableField(fill = FieldFill.INSERT)
private Long fuId;
/**
* 绉熸埛id
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3