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

xuhy

2025-06-03 d90ac211d9168c1ce8d390838f367a0db00afb52

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/EvaluateFallbackFactory.java

@@ -43,7 +43,7 @@
            }

            @Override
            public R<Page<EvaluatePageVO>> evaluateList1(List<String> cityList, Integer userId, Integer pageNum, Integer pageSize) {
            public R<Page<EvaluatePageVO>> evaluateList1(List<String> cityList, Integer userId, Integer pageNum, Integer pageSize,List<String> siteIds) {
                return R.fail(cause.getMessage());
            }