diff --git a/src/main/java/com/casic/entity/ButaneData.java b/src/main/java/com/casic/entity/ButaneData.java
index 5ef6e5c..2e051be 100644
--- a/src/main/java/com/casic/entity/ButaneData.java
+++ b/src/main/java/com/casic/entity/ButaneData.java
@@ -14,7 +14,7 @@
 @Builder
 public class ButaneData extends Model<ButaneData> {
 
-    @TableId(value = "DBID", type = IdType.AUTO)
+    @TableId(value = "DBID")
     private Long dbid;
 
     private String devcode;

diff --git a/src/main/java/com/casic/entity/ButaneData.java b/src/main/java/com/casic/entity/ButaneData.java
index 5ef6e5c..2e051be 100644
--- a/src/main/java/com/casic/entity/ButaneData.java
+++ b/src/main/java/com/casic/entity/ButaneData.java
@@ -14,7 +14,7 @@
 @Builder
 public class ButaneData extends Model<ButaneData> {
 
-    @TableId(value = "DBID", type = IdType.AUTO)
+    @TableId(value = "DBID")
     private Long dbid;
 
     private String devcode;
diff --git a/src/main/java/com/casic/service/AlarmRecordFly.java b/src/main/java/com/casic/service/AlarmRecordFly.java
index 1aa80cf..339034e 100644
--- a/src/main/java/com/casic/service/AlarmRecordFly.java
+++ b/src/main/java/com/casic/service/AlarmRecordFly.java
@@ -9,7 +9,7 @@
     static {
         alarmRecord = new AlarmRecord();
         alarmRecord.setIssend("0");
-        alarmRecord.setDeviceTypeName("家用可燃气体探测仪");
+        alarmRecord.setDeviceTypeName("可燃气体探测器");
         alarmRecord.setIssend("0");
         alarmRecord.setItemname("default");
         alarmRecord.setMessage("1");

diff --git a/src/main/java/com/casic/entity/ButaneData.java b/src/main/java/com/casic/entity/ButaneData.java
index 5ef6e5c..2e051be 100644
--- a/src/main/java/com/casic/entity/ButaneData.java
+++ b/src/main/java/com/casic/entity/ButaneData.java
@@ -14,7 +14,7 @@
 @Builder
 public class ButaneData extends Model<ButaneData> {
 
-    @TableId(value = "DBID", type = IdType.AUTO)
+    @TableId(value = "DBID")
     private Long dbid;
 
     private String devcode;
diff --git a/src/main/java/com/casic/service/AlarmRecordFly.java b/src/main/java/com/casic/service/AlarmRecordFly.java
index 1aa80cf..339034e 100644
--- a/src/main/java/com/casic/service/AlarmRecordFly.java
+++ b/src/main/java/com/casic/service/AlarmRecordFly.java
@@ -9,7 +9,7 @@
     static {
         alarmRecord = new AlarmRecord();
         alarmRecord.setIssend("0");
-        alarmRecord.setDeviceTypeName("家用可燃气体探测仪");
+        alarmRecord.setDeviceTypeName("可燃气体探测器");
         alarmRecord.setIssend("0");
         alarmRecord.setItemname("default");
         alarmRecord.setMessage("1");
diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
index c7b8372..6f6ac5f 100644
--- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java
@@ -95,7 +95,7 @@
                 break;
             default:
                 //产生新的报警，消除报警
-                butaneData.setDescn("家用燃气报警");
+                butaneData.setDescn("可燃气体探测器报警");
                 butaneData.setStatus("1");
                 alarmRecord.setDbid(null);
                 alarmRecord.setDeviceCode(devcode);