Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-18 b9b4d5c966a7b6c8c830af7f7d5c9f351d144af2

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