Merge remote-tracking branch 'origin/master'

xuhy

2024-10-25 ab9eb0f1fcd3a20f7b1ec90fb63e9a8cb7f7792a

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

@@ -19,6 +19,6 @@
    * 获取积分设置
    * @return
    */
   @PostMapping("/integral/getSet")
   @GetMapping("/integral/getSet")
   R<TIntegralRule> getSet();
}