From b5c57acfa5a467a81da650354f35bb8e27b412c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Tue, 29 Apr 2025 09:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=A2=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java   | 2 +-
 src/main/resources/mappers/basic/TbTowerMapper.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java
index 58b8fea..ec71c4f 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java
@@ -26,7 +26,7 @@ public class TbThreeSpanVo {
     /**
      * 跨越类型 1.跨线路 2.跨公路 3.跨铁路
      */
-    @Excel(name = "跨越类型", sort =3,readConverterExp = "1=跨线路,2=跨公路,2=跨铁路")
+    @Excel(name = "跨越类型", sort =3,readConverterExp = "1=跨线路,2=跨公路,3=跨铁路")
     private String spanType;
 
     /**
diff --git a/src/main/resources/mappers/basic/TbTowerMapper.xml b/src/main/resources/mappers/basic/TbTowerMapper.xml
index e2b2e18..b4f1c3a 100644
--- a/src/main/resources/mappers/basic/TbTowerMapper.xml
+++ b/src/main/resources/mappers/basic/TbTowerMapper.xml
@@ -55,7 +55,7 @@
 
     <select id="getTbProjectList" resultType="com.bonus.digitalSignage.basic.vo.TbTowerVo">
         select id as id,pro_id as proId,tower_name as towerName,lon as lon,lat as lat,
-               baidu_lon as baiduLon,baidu_lat as baiduLat,sort as sort,central_meridian as centralMeridian
+               baidu_lon as baiduLon,baidu_lat as baiduLat,sort as sort,central_meridian as centralMeridian,upload_type as uploadType
             from tb_tower where pro_id = #{proId} and is_actvice = '1'
         <if test="towerName != '' and towerName != null">and tower_name  like concat('%', #{towerName}, '%')</if>
         ORDER BY sort