Merge remote-tracking branch 'origin/master'

无关风月

2026-01-29 dc29f2f4f03cb93367b759c38c7e98c358e1f90e

 ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java

@@ -558,7 +558,7 @@
                            break;
                        }
                    }
                    //短路与开关
                    //短路或开关
                    // if (!matchesRule) {
                    //     break;
                    // }