Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-18 457ffacdf3c34e6da715d1588df8d835535e3b98

 server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java

@@ -69,6 +69,7 @@
        log.setType(Constants.ONE);
        log.setMsg("");
        log.setInfo(info);
        log.setIsdeleted(Constants.ZERO);
        mqttLogMapper.insert(log);
        return  log;
    }