Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2025-02-05 9ce27f53094be15ee2e69c0dce31e3f324bfda99

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

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