From 79bb09af27e6b2e6b4b898af7a1922e9c82f8762 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 04 三月 2025 14:03:13 +0800
Subject: [PATCH] update

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcBigScreenEquipmentDto.java    |    2 ++
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcBigScreenEquipmentDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcBigScreenEquipmentDto.java
index 4817b6b..2b513c7 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcBigScreenEquipmentDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcBigScreenEquipmentDto.java
@@ -19,6 +19,8 @@
 
     private String equipmentImage;
 
+    private Integer oporation;
+
     private Integer equipmentStatus;
 
     private String equId;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
index 55a690c..2bec069 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
@@ -19,7 +19,8 @@
             me.equipment_name AS equipmentName,
             me.equipment_type AS equipmentType,
             met.equipment_type_pictures AS equipmentImage,
-            a.Oporation AS equipmentStatus,
+            a.Oporation AS oporation,
+            me.equipment_status AS equipmentStatus,
             mew.coordinate_left AS coordinateLeft,
             mew.coordinate_top AS coordinateTop,
             mew.vw AS vw,

--
Gitblit v1.9.3