Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/MqttServiceImpl.java

@@ -157,7 +157,7 @@ public class MqttServiceImpl extends ServiceImpl<MqttCommandMapper, MqttCommand>
             Map<String, String> map = redisService.getMap(key);
             if (Emptys.check(map)) {
                 String time = map.get("time");
-                if (DataTime.stringContrast(time, backClientTime) < 0) {
+                if (DataTime.stringContrast(time, backClientTime) >= 0) {
                     return R.ok();
                 }
             }