diff --git a/casic-iot-dao/src/resource/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/resource/mapper/common/SysCommonMapper.xml
index 0211fbd..880f7d4 100644
--- a/casic-iot-dao/src/resource/mapper/common/SysCommonMapper.xml
+++ b/casic-iot-dao/src/resource/mapper/common/SysCommonMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.casic.missiles.mapper.common.SysCommonMapper">
 
     <select id="getDictMapByCode" resultType="java.util.Map">
-        SELECT  NAME,CODE
+        SELECT  name,code
         from sys_dict
          where  pid=(
             SELECT id

diff --git a/casic-iot-dao/src/resource/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/resource/mapper/common/SysCommonMapper.xml
index 0211fbd..880f7d4 100644
--- a/casic-iot-dao/src/resource/mapper/common/SysCommonMapper.xml
+++ b/casic-iot-dao/src/resource/mapper/common/SysCommonMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.casic.missiles.mapper.common.SysCommonMapper">
 
     <select id="getDictMapByCode" resultType="java.util.Map">
-        SELECT  NAME,CODE
+        SELECT  name,code
         from sys_dict
          where  pid=(
             SELECT id
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
index b80040a..75aea72 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
@@ -148,7 +148,7 @@
             if (ObjectUtil.isEmpty(importDTO.getModelName()) || !modelMap.containsKey(importDTO.getModelName())) {
                 throw new BusinessException(1500, String.format(validMsg, i + 1, "设备型号不能为空或不正确"));
             } else {
-                importDTO.setModel(Integer.valueOf(modelMap.get(importDTO.getModel())));
+                importDTO.setModel(Integer.valueOf(modelMap.get(importDTO.getModelName())));
             }
             if (ObjectUtil.isEmpty(importDTO.getDeviceTypeName()) || !deviceMap.containsKey(importDTO.getDeviceTypeName())) {
                 throw new BusinessException(1500, String.format(validMsg, i + 1, "设备类型不能为空或不正确"));