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

无关风月

2025-08-27 e739a69ee991bac72c50bd8c7a00468bcd8039a0

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java

@@ -8,6 +8,7 @@
import com.ruoyi.other.api.factory.StoreFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

@@ -19,9 +20,12 @@
public interface OtherClient {

    @GetMapping(value = "/integral/getSetBySiteId")
    R<TIntegralRule> getSetBySiteId(@RequestParam("id") Integer id);
    R<TIntegralRule> getSetBySiteId(@RequestParam("siteId") Integer siteId);
    @GetMapping(value = "/integral/saveIntegralRecord")
    R saveIntegralRecord(@RequestBody IntegralRecord record);

    @GetMapping(value = "/integralRule/getServiceStatus/{userId}")
    R<String> getServiceStatus(@PathVariable("userId") Integer userId);


}