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

k94314517

2023-10-28 11ff07252c6e6ed90e810cd9e5d033e7c7438a45

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

@@ -13,6 +13,6 @@
     * 设备上报数据（上报）
     * @param param 上报参数
     */
    void listener(String param ,String topic);
    void listener(String msgId,String param ,String topic);

}