diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysTcpMessage.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysTcpMessage.java
index 2f87e1f..c907e6d 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysTcpMessage.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysTcpMessage.java
@@ -11,4 +11,6 @@ public class SysTcpMessage {
     private String devCode;
 
     private float  distance;
+
+    private String nearelectric;
 }
diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/JdConfigVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/JdConfigVo.java
index a00f5b5..a139f18 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/JdConfigVo.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/JdConfigVo.java
@@ -43,6 +43,9 @@ public class JdConfigVo {
         @Pattern(regexp = "^(?:100(?:\\.0{1,2})?|[1-9][0-9]?(?:\\.\\d{1,2})?|1(?:\\.\\d{1,2})?)$", message = "距离为（1-100米）区间内,最多保留两位小数", groups = {Query.class})
         private String distance;
 
+        /**近电报警距离等级*/
+        private String nearelectric;
+
         public interface Query {
         }
     }
diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/CraneMonitorServiceImpl.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/CraneMonitorServiceImpl.java
index 7458f58..8ebe5cd 100644
--- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/CraneMonitorServiceImpl.java
+++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/CraneMonitorServiceImpl.java
@@ -113,6 +113,8 @@ public class CraneMonitorServiceImpl implements ICraneMonitorService {
             SysTcpMessage sysTcpMessage = new SysTcpMessage();
             sysTcpMessage.setDevCode(vo.getDevCode());
             sysTcpMessage.setDistance(Float.parseFloat(configItems.get(0).getDistance()));
+            sysTcpMessage.setNearelectric(configItems.get(0).getNearelectric());
+            configItems.get(0).setVoltageLevel(configItems.get(0).getNearelectric());
             R result = remoteTcpService.setMessage(sysTcpMessage, SecurityConstants.INNER);
             log.info("调用结果：code:{},msg:{}", result.getCode(),result.getMsg());
             if (result != null && result.getCode() == HttpStatus.SUCCESS && Objects.equals(result.getMsg(), BusinessConstants.SET_MSG)) {
diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/WarnReminderMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/WarnReminderMapper.xml
index d4a9997..2e593ec 100644
--- a/bonus-modules/bonus-app/src/main/resources/mapper/WarnReminderMapper.xml
+++ b/bonus-modules/bonus-app/src/main/resources/mapper/WarnReminderMapper.xml
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
         case
         WHEN  tw.dev_type=1 then tdd.dict_label
-        WHEN  tw.dev_type=0 then '手环箱'
+        WHEN  tw.dev_type=0 then '手环'
         ELSE ''
         END AS deviceTypeName,
         tw.warn_time warnTime,tw.warn_content warnContent,
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and tw.pro_id = #{proId}
             </if>
         </where>
-        order by  deviceTypeName ASC
+        order by  tw.warn_time DESC
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java
index a3ee406..4105e9e 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java
@@ -634,6 +634,8 @@ public class ConsControlServiceImpl implements IConsControlService {
             SysTcpMessage sysTcpMessage = new SysTcpMessage();
             sysTcpMessage.setDevCode(vo.getDevCode());
             sysTcpMessage.setDistance(Float.parseFloat(configItems.get(0).getDistance()));
+            sysTcpMessage.setNearelectric(configItems.get(0).getNearelectric());
+            configItems.get(0).setVoltageLevel(configItems.get(0).getNearelectric());
             R result = remoteTcpService.setMessage(sysTcpMessage, SecurityConstants.INNER);
             log.info("调用结果：code:{},msg:{}", result.getCode(),result.getMsg());
             if (result != null && result.getCode() == HttpStatus.SUCCESS && Objects.equals(result.getMsg(), BusinessConstants.SET_MSG)) {