diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java
index c0e9f61..9fcd007 100644
--- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java
+++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java
@@ -345,7 +345,7 @@ public class AedEquipmentManger implements Serializable {
      */
     @Excel(name = "型号", width = 15)
     @Schema(title = "型号")
-    private String model;
+    private String modelNumber;
     /**
      * 来源字典 设备类型 1：立式 ，2：挂式，3：车载
      */
diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblQimoNotice.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblQimoNotice.java
index e4dbd82..029fe02 100644
--- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblQimoNotice.java
+++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblQimoNotice.java
@@ -81,13 +81,13 @@ public class TblQimoNotice implements Serializable {
      */
     @Schema(title = "通话接通时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @Excel(name = "通话接通时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    private java.util.Date begin;
+    private java.util.Date beginTime;
     /**
      * 通话结束时间
      */
     @Schema(title = "通话结束时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @Excel(name = "通话结束时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    private java.util.Date end;
+    private java.util.Date endTime;
     /**
      * 来电进入技能组时间
      */
diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/util/QimoVoUtil.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/util/QimoVoUtil.java
index 474acd6..bff0cfb 100644
--- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/util/QimoVoUtil.java
+++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/util/QimoVoUtil.java
@@ -33,8 +33,8 @@ public class QimoVoUtil {
         try {
             qimoNoticeEntity.setRing(DateUtils.parseDate(qimoVo.getRing(), "yyyy-MM-dd hh:mm:ss"));
             qimoNoticeEntity.setRingingDate(DateUtils.parseDate(qimoVo.getRingingDate(), "yyyy-MM-dd hh:mm:ss"));
-            qimoNoticeEntity.setBegin(DateUtils.parseDate(qimoVo.getBegin(), "yyyy-MM-dd hh:mm:ss"));
-            qimoNoticeEntity.setEnd(DateUtils.parseDate(qimoVo.getEnd(), "yyyy-MM-dd hh:mm:ss"));
+            qimoNoticeEntity.setBeginTime(DateUtils.parseDate(qimoVo.getBegin(), "yyyy-MM-dd hh:mm:ss"));
+            qimoNoticeEntity.setEndTime(DateUtils.parseDate(qimoVo.getEnd(), "yyyy-MM-dd hh:mm:ss"));
             qimoNoticeEntity.setQueueTime(DateUtils.parseDate(qimoVo.getQueueTime(), "yyyy-MM-dd hh:mm:ss"));
             qimoNoticeEntity.setRingingTimestamp(qimoVo.getRingingTimestamp());
         } catch (ParseException e) {
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml
index 294da69..9d89b41 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml
@@ -25,7 +25,6 @@
         operate_instruction as operateInstruction,
         operate_video as operateVideo,
         disclaimer as disclaimer,
-        control_org_name as controlOrgName,
         manage_user_name as manageUserName,
         manage_user_mobile as manageUserMobile,
         mfrs_Mobile as mfrsMobile,
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/async/AsyncImportService.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/async/AsyncImportService.java
index 8c5f935..0f51312 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/async/AsyncImportService.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/async/AsyncImportService.java
@@ -139,11 +139,11 @@ public class AsyncImportService {
                 exportVO.setCenterName(Optional.ofNullable(groupedMap.get(tblQimoNotice.getExten())).map(EmergencyGrouped::getCenterName).orElse(""));
                 exportVO.setSeatId(tblQimoNotice.getExten());
                 exportVO.setPhone(tblQimoNotice.getCallNo());
-                Optional.ofNullable(tblQimoNotice.getBegin())
-                        .ifPresent(begin -> Optional.ofNullable(tblQimoNotice.getEnd()).ifPresent(end -> {
+                Optional.ofNullable(tblQimoNotice.getBeginTime())
+                        .ifPresent(begin -> Optional.ofNullable(tblQimoNotice.getEndTime()).ifPresent(end -> {
                             exportVO.setCallDuration(String.valueOf(end.getTime() - begin.getTime()));
                         }));
-                exportVO.setCallTime(Optional.ofNullable(tblQimoNotice.getBegin())
+                exportVO.setCallTime(Optional.ofNullable(tblQimoNotice.getBeginTime())
                         .map(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)::format).orElse(""));
                 exports.add(exportVO);
             }
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/model/vo/PhoneDataInfo.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/model/vo/PhoneDataInfo.java
index 83db736..c65f645 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/model/vo/PhoneDataInfo.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/model/vo/PhoneDataInfo.java
@@ -60,8 +60,8 @@ public class PhoneDataInfo {
         this.seatNo = tblQimoNotice.getExten();
         this.phone = tblQimoNotice.getCallNo();
         this.callTime = tblQimoNotice.getRing();
-        if (ObjUtil.isNotEmpty(tblQimoNotice.getBegin()) && ObjUtil.isNotEmpty(tblQimoNotice.getEnd())) {
-            this.callDuration = String.valueOf((tblQimoNotice.getEnd().getTime() - tblQimoNotice.getBegin().getTime()) / 1000);
+        if (ObjUtil.isNotEmpty(tblQimoNotice.getBeginTime()) && ObjUtil.isNotEmpty(tblQimoNotice.getEndTime())) {
+            this.callDuration = String.valueOf((tblQimoNotice.getEndTime().getTime() - tblQimoNotice.getBeginTime().getTime()) / 1000);
         }
     }
 }
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencyGroupedServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencyGroupedServiceImpl.java
index f3fa2c6..bb2aacb 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencyGroupedServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencyGroupedServiceImpl.java
@@ -251,8 +251,8 @@ public class EmergencyGroupedServiceImpl extends MPJBaseServiceImpl<EmergencyGro
             vo.setDeptName(Optional.ofNullable(thirdDepart).map(SysDepart::getDepartName).orElse(""));
             Optional.ofNullable(item.getExten()).ifPresent(vo::setSeatId);
             Optional.ofNullable(item.getCallNo()).ifPresent(vo::setPhone);
-            if (ObjectUtil.isNotEmpty(item.getEnd()) && ObjectUtil.isNotEmpty(item.getBegin())){
-                vo.setCallDuration(item.getEnd().getTime() - item.getBegin().getTime());
+            if (ObjectUtil.isNotEmpty(item.getEndTime()) && ObjectUtil.isNotEmpty(item.getBeginTime())){
+                vo.setCallDuration(item.getEndTime().getTime() - item.getBeginTime().getTime());
             }
             Optional.ofNullable(item.getCreateDate()).ifPresent(vo::setCallTime);
             voList.add(vo);
diff --git a/health-emergency/health-emergency-start/src/main/java/com/renkang/HealthEmergencyCloudApplication.java b/health-emergency/health-emergency-start/src/main/java/com/renkang/HealthEmergencyCloudApplication.java
index 6458001..97b2f04 100644
--- a/health-emergency/health-emergency-start/src/main/java/com/renkang/HealthEmergencyCloudApplication.java
+++ b/health-emergency/health-emergency-start/src/main/java/com/renkang/HealthEmergencyCloudApplication.java
@@ -2,9 +2,10 @@ package com.renkang;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
-@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"})
+@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"},exclude = QuartzAutoConfiguration.class)
 @EnableFeignClients(basePackages = {"org.jeecg", "com.renkang"})
 public class HealthEmergencyCloudApplication {