type.unit问题

data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml

@@ -287,7 +287,7 @@
         	device_sn,
             device_name,
             monitoring_point_name as monitorPointName,
-        	type.unit typeUnit
+            device_info.unit typeUnit
         from
         	device_info
         left join type on device_info.type_id = type.id
@@ -307,7 +307,7 @@
         	device_info.device_id,
         	device_info.device_sn,
         	device_info.device_name,
-        	type.unit typeUnit,
+        	device_info.unit as typeUnit,
         	type.name deviceTypeName,
         	basic_monitoring_asset.symbol assetSymbol,
         	bfloor.name floorName,
@@ -367,7 +367,7 @@
         	device_info.device_id,
         	device_info.device_sn,
         	device_info.device_name,
-        	type.unit typeUnit,
+            device_info.unit typeUnit,
         	type.name deviceTypeName,
         	basic_monitoring_asset.symbol assetSymbol,
         	bfloor.name floorName,
@@ -477,7 +477,7 @@
         select
 	        device_info.device_id,
 	        device_info.device_sn,
-	        type.unit typeUnit
+            device_info.unit typeUnit
         from
         	device_info
         left join type on device_info.type_id = type.id