合并代码

puzhibing

2024-12-26 e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5

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

@@ -5,6 +5,7 @@
import com.ruoyi.other.api.domain.BaseSetting;
import com.ruoyi.other.api.factory.BaseSettingClientFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;

@@ -21,6 +22,6 @@
    * @param id
    * @return
    */
   @PostMapping("/base-setting/getBaseSetting")
   @GetMapping("/base-setting/getBaseSetting")
   R<BaseSetting> getBaseSetting(@RequestParam("id") Integer id);
}