Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-26 68a9c2da2d18c25fd7126b63ca3c1a98a63d7e77

 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();
}