Merge remote-tracking branch 'origin/master'

xuhy

2024-08-17 5a5b01fa9824a42e3eb033088a20e24c32b30dda

 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")
@@ -87,10 +90,6 @@
            THtml tHtml = new THtml();
            tHtml.setType(type);
            tHtml.setContent(info);


            tHtml.setCreateTime(LocalDateTime.now());
            tHtml.setDelFlag(false);
            htmlService.save(tHtml);
        }else{
            g.setContent(info);