Merge branch 'fpg-master'

jeecg-module-gather/src/main/java/org/jeecg/modules/deviceLog/mapper/xml/DeviceMapper.xml

@@ -3,11 +3,11 @@
 <mapper namespace="org.jeecg.modules.deviceLog.mapper.DeviceMapper">
 
     <select id="listAll" resultType="org.jeecg.modules.deviceLog.entity.Device">
-        select id,device_title as name, device_code as code, device_gather as deviceType,'0' as useStatus,freq,status
+        select id,device_title as name, device_gather as deviceType,'0' as useStatus,freq,status
         from device_gather_service
     </select>
     <select id="listStop" resultType="org.jeecg.modules.deviceLog.entity.Device">
-        select id,device_title as name, device_code as code, device_gather as deviceType,'0' as useStatus,freq,status
+        select id,device_title as name, device_gather as deviceType,'0' as useStatus,freq,status
         from device_gather_service
         where status = '1'
     </select>