Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-17 107bd0bb312b0809babde46ca4caffc72504a241

Merge remote-tracking branch 'origin/master'

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

@@ -62,6 +62,9 @@
            "11=开票说明")
    public R<String> getInfo(Integer type) {
        THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",type));
        if (g == null){
            return R.ok("");
        }
        return R.ok(g.getContent());
    }
    @GetMapping("/saveInfo")