Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-28 c0a5d6a40520cf89b9989cff58c1c64fbed47c2a

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