From 41d319e3ef52ae5da5e16ba730b3237a5771e720 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 25 二月 2025 18:45:11 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0

---
 src/main/resources/mapper/FaultUploadApplicationMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/FaultUploadApplicationMapper.xml b/src/main/resources/mapper/FaultUploadApplicationMapper.xml
index 5c8337f..0108395 100644
--- a/src/main/resources/mapper/FaultUploadApplicationMapper.xml
+++ b/src/main/resources/mapper/FaultUploadApplicationMapper.xml
@@ -4,7 +4,7 @@
 
 
     <select id="getStationInfWithSpecificMainId" resultType="com.whyc.pojo.StationInf">
-        select stt.stationName3,stt.stationName5,apl.main_id as togetherFlag  from web_site.tb_fault_upload_application apl left join db_battinf.tb_station_inf stt on apl.station_id = stt.stationId
+        select stt.stationName3,stt.stationName5,apl.main_id as togetherFlag  from web_site.tb_fault_upload apl left join db_battinf.tb_station_inf stt on apl.station_id = stt.stationId
         <where>
             <if test="list!=null and list.size() > 0">
             apl.main_id in

--
Gitblit v1.9.1