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

jiaosong

2023-10-16 aa6febca297b0e1a68b1877fc9f41885e9fc0c7a

 server/services/src/main/java/com/doumee/service/business/DeviceService.java

@@ -17,8 +17,7 @@
     */
    MqttLog openLock(Locks locks);

    void startSubcribe();

    MqttLog getLockInfo(Locks locks);

    void testPush(String topic, String json);
}