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

Pu Zhibing

2025-02-12 697582a7e65e6110a22dad7bc8241d25fe3ecc51

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java

@@ -79,6 +79,12 @@
        return R.ok(res);
    }
    
    @PostMapping("/getSet2")
    public R<TIntegralRule> getSet2() {
        TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>());
        return R.ok(res);
    }
    
    
    
    @GetMapping("/getSet1")