Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-03-20 1d1e3c49ebd29144b2f6ce8710523bae763b855b

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/IntegrationFallbackFactory.java

@@ -124,7 +124,7 @@
            }

            @Override
            public R<String> setupBillingModel1(String deviceId) {
            public R<String> setupBillingModel1(String deviceId, String json) {
                return R.fail("远程更新硬件：" + throwable.getMessage());
            }
        };