Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-16 7ee0ca402600bb6c71af722603c5a3d4497044a6

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java

@@ -382,7 +382,8 @@

    @ApiOperation(value = "计费模型设置",tags = {"硬件接口"})
    @GetMapping(value = "/setupBillingModel")
    public R setupBillingModel(String deviceId) {
    public R setupBillingModel() {
        String deviceId = "3401231001200202";
        // TODO 罗  计费模型设置
        SetupBillingModel setupBillingModel = new SetupBillingModel();
        // 计费模型