diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 65c64c9..655a57a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 65c64c9..655a57a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 4c3e5d5..fc56b9d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -53,7 +53,7 @@
     private String deptName;
     @Excel(name = "安装时间", orderNum = "9")
     private String installDate;
-    @Excel(name = "安装年份", orderNum = "10")
+//    @Excel(name = "安装年份", orderNum = "10")
     private String installYear;
 
     @Excel(name = "设备位置", orderNum = "4")
@@ -88,7 +88,7 @@
     /**
      * 设备厂商
      */
-    @Excel(name = "设备厂商", orderNum = "11")
+    @Excel(name = "设备厂商", orderNum = "10")
     private String manufacture;
 
     /**
@@ -105,12 +105,12 @@
     /**
      * 班组名称
      */
-    @Excel(name = "分管班组", orderNum = "12")
+    @Excel(name = "分管班组", orderNum = "11")
     private String deptName3;
     /**
      * 班组名称
      */
-    @Excel(name = "片区", orderNum = "13")
+    @Excel(name = "片区", orderNum = "12")
     private String areaName3;
     @Override
     protected Serializable pkVal() {

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 65c64c9..655a57a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 4c3e5d5..fc56b9d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -53,7 +53,7 @@
     private String deptName;
     @Excel(name = "安装时间", orderNum = "9")
     private String installDate;
-    @Excel(name = "安装年份", orderNum = "10")
+//    @Excel(name = "安装年份", orderNum = "10")
     private String installYear;
 
     @Excel(name = "设备位置", orderNum = "4")
@@ -88,7 +88,7 @@
     /**
      * 设备厂商
      */
-    @Excel(name = "设备厂商", orderNum = "11")
+    @Excel(name = "设备厂商", orderNum = "10")
     private String manufacture;
 
     /**
@@ -105,12 +105,12 @@
     /**
      * 班组名称
      */
-    @Excel(name = "分管班组", orderNum = "12")
+    @Excel(name = "分管班组", orderNum = "11")
     private String deptName3;
     /**
      * 班组名称
      */
-    @Excel(name = "片区", orderNum = "13")
+    @Excel(name = "片区", orderNum = "12")
     private String areaName3;
     @Override
     protected Serializable pkVal() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index da726a6..60f445b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -227,7 +227,7 @@
             area3List.forEach(area3 -> {
                 if (deviceDto.getWellCode().equals(area3.get("wellCode"))) {
                     deviceDto.setAreaName3(area3.get("areaName3"));
-                    deviceDto.setWellName(area3.get("wellName"));
+//                    deviceDto.setWellName(area3.get("wellName"));
                     dept3List.forEach(dept3 -> {
                         if (area3.get("PARENT_ID").equals(dept3.get("org_id"))) {
                             deviceDto.setDeptName3(dept3.get("deptName3"));