diff --git a/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt b/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt
index 3b076df..58073a1 100644
--- a/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt
+++ b/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt
@@ -9,7 +9,7 @@ import com.common.commonlib.db.entity.GasType
 
 @Dao
 interface GasTypeDao {
-    @Query("SELECT * FROM gas_type")
+    @Query("SELECT * FROM gas_type ORDER BY sensor_index")
     suspend fun getAll(): List<GasType>
 
     @Query("SELECT * FROM gas_type WHERE gas_name IS :name")
diff --git a/library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt b/library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt
index c97a88b..b66f722 100644
--- a/library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt
+++ b/library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt
@@ -6,8 +6,8 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "gas_type")
 data class GasType(
-    @PrimaryKey @ColumnInfo(name = "gas_name") var type: String,
+    @ColumnInfo(name = "gas_name") var type: String,
     @ColumnInfo(name = "status") var status: Int = 3,
-    @ColumnInfo(name = "sensor_index") var sensorIndex: Int = -1,
+    @PrimaryKey @ColumnInfo(name = "sensor_index") var sensorIndex: Int = -1,
     @ColumnInfo(name = "nick_name") var nickName: String? = null,
 )