From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态(回款完成,未完成) 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制,过时后状态改为已过期

---
 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
index 408a13f..4911305 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
@@ -19,20 +19,21 @@
          * 鍖哄煙鍚嶇О
          */
         @ApiModelProperty("鍖哄煙鍚嶇О")
-        @Excel(name = "鍖哄煙鍚嶇О")
         private String areaName;
 
         /**
          * 鍖哄煙绫诲瀷
          */
         @ApiModelProperty("鍖哄煙绫诲瀷")
-        @Excel(name = "鍖哄煙绫诲瀷")
         private String areaType;
+        /**
+         * 鎺掑簭
+         */
+        private Long sort;
 
         /**
          * 鐖剁被id
          */
-        @TableField(fill = FieldFill.INSERT)
         private Long fuId;
         /**
          * 绉熸埛id

--
Gitblit v1.9.3