From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..61442c4 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
@@ -19,29 +19,32 @@
* 鍖哄煙鍚嶇О
*/
@ApiModelProperty("鍖哄煙鍚嶇О")
- @Excel(name = "鍖哄煙鍚嶇О")
private String areaName;
/**
* 鍖哄煙绫诲瀷
*/
@ApiModelProperty("鍖哄煙绫诲瀷")
- @Excel(name = "鍖哄煙绫诲瀷")
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;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3