diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index 726162c..31af20a 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -159,44 +159,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.material.device.domain.vo.DevInfoVo">
-        select d.*,c.company_name,c.create_time as company_create_time,c.logo_url as company_logo_url,
-               c.auth_phone, mt1.type_name as device_name,
-               mt2.type_name as group_name, mt3.type_name as type_name,
-               col.id as collect_id, h.search_num
-        from ma_dev_info d
-                 left join bm_company_info c on d.own_co = c.company_id
-                 left join ma_user_collect col on d.ma_id = col.ma_id
-                 left join ma_hot_search h on d.ma_id = h.ma_id
-                 left join ma_type t on d.type_id = t.type_id
-                 left join ma_type mt1 on d.type_id = mt1.type_id
-                 left join ma_type mt2 on mt1.parent_id = mt2.type_id
-                 left join ma_type mt3 on mt2.parent_id = mt3.type_id
-        where d.ma_id = #{maId} and  d.is_active='1'
         SELECT
-        d.ma_id as maId,
-        d.code as code,
-        d.device_name as deviceName,
-        d.device_weight as deviceWeight,
-        d.type_id as typeId,
-        d.ma_status as maStatus,
-        d.brand as brand,
-        d.model_name as modelName,
-        d.production_date as productionDate,
-        d.working_hours as workingHours,
-        d.serial_number as serialNumber,
-        d.month_lease_price as monthLeasePrice,
-        d.day_lease_price as dayLeasePrice,
-        d.person as person,
-        d.person_phone as personPhone,
-        c.company_name as companyName,
-        h.search_num as searchNum
+            d.ma_id as maId,
+            d.code as code,
+            d.device_name as deviceName,
+            d.device_weight as deviceWeight,
+            d.type_id as typeId,
+            d.ma_status as maStatus,
+            d.brand as brand,
+            d.model_name as modelName,
+            d.production_date as productionDate,
+            d.working_hours as workingHours,
+            d.serial_number as serialNumber,
+            d.month_lease_price as monthLeasePrice,
+            d.day_lease_price as dayLeasePrice,
+            d.person as person,
+            d.person_phone as personPhone,
+            c.company_name as companyName,
+            h.search_num as searchNum
         FROM
-        ma_dev_info d
-        LEFT JOIN ma_hot_search h ON d.ma_id = h.ma_id
-        LEFT JOIN bm_company_info c ON d.own_co = c.company_id
+            ma_dev_info d
+                LEFT JOIN ma_hot_search h ON d.ma_id = h.ma_id
+                LEFT JOIN bm_company_info c ON d.own_co = c.company_id
         where
             d.is_active='1' and d.ma_id = #{maId}
->>>>>>> origin/master
     </select>
 
     <select id="getFilesByMaId" parameterType="Long" resultType="com.bonus.common.biz.domain.SysFile">