From 530b456eded06e0692e1d8bd5891069439c8f8f8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 17 四月 2026 15:10:56 +0800
Subject: [PATCH] fix: 1.已发货的销售台账对应的出入库记录做限制不能删除;2.销售台账入库操作后,点击删除,对应的销售入库记录未一并删除;3.销售台账入库状态新增部分入库

---
 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