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

无关风月

2025-08-14 79d5e91444eca538d523d3bd014528abd939da33

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

@@ -523,7 +523,7 @@
                tIntegralRule.setContent(data1.getRemark());
                tIntegralRule.setSiteId(0);
                return R.ok(tIntegralRule);
            } else if (data.getRoleType() == 3 ){
            } else if (data.getRoleType() == 2){
                TIntegralRule res = integralRuleService.lambdaQuery().eq(TIntegralRule::getSiteId, data.getSiteId()).one();
                return R.ok(res);
            }else{