Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-13 26d4aacdf40f7283dc3dae2043a35162b2665864

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/IntegrationClient.java

@@ -9,6 +9,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

/**
 * 充电服务
 * @author ruoyi
@@ -176,7 +178,7 @@
    public R<String> platformRemoteUpdate(@RequestBody PlatformRemoteUpdate platformRemoteUpdate);

    @PostMapping("/iot/setupBillingModel")
    public R<String> setupBillingModel1(@RequestParam("deviceId") String deviceId);
    public R<String> setupBillingModel1(@RequestParam("deviceId") String deviceId, @RequestParam("json") String json);